bcachefs: Removes NULL pointer checks for __filemap_get_folio return values

__filemap_get_folio the return value cannot be NULL, so unnecessary checks
are removed.

Signed-off-by: Youling Tang <tangyouling@kylinos.cn>
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>

diff --git a/fs/bcachefs/fs-io-buffered.c b/fs/bcachefs/fs-io-buffered.c
index 0923f38a2fcd23143121795dd04c6a388967fd6e..b853cecd3c1b965f53537bf6ff5b31be72b3cb3d 100644 (file)
--- a/fs/bcachefs/fs-io-buffered.c
+++ b/fs/bcachefs/fs-io-buffered.c
@@ -686,7 +686,7 @@ int bch2_write_begin(struct file *file, struct address_space *mapping,
        folio = __filemap_get_folio(mapping, pos >> PAGE_SHIFT,
                                    FGP_WRITEBEGIN | fgf_set_order(len),
                                    mapping_gfp_mask(mapping));
-       if (IS_ERR_OR_NULL(folio))
+       if (IS_ERR(folio))
                goto err_unlock;
 
        offset = pos - folio_pos(folio);

diff --git a/fs/bcachefs/fs-io-pagecache.c b/fs/bcachefs/fs-io-pagecache.c
index 51a499c5a7b6467a443e1ace32c0b07a17c2fec1..e072900e6a5b9eb11ca21b62ac95766181401242 100644 (file)
--- a/fs/bcachefs/fs-io-pagecache.c
+++ b/fs/bcachefs/fs-io-pagecache.c
@@ -29,7 +29,7 @@ int bch2_filemap_get_contig_folios_d(struct address_space *mapping,
                        break;
 
                f = __filemap_get_folio(mapping, pos >> PAGE_SHIFT, fgp_flags, gfp);
-               if (IS_ERR_OR_NULL(f))
+               if (IS_ERR(f))
                        break;
 
                BUG_ON(fs->nr && folio_pos(f) != pos);

diff --git a/fs/bcachefs/fs-io.c b/fs/bcachefs/fs-io.c
index 0021db19148070865966701e71e8a0d6513c50ae..c6fdfec510823c6ffb8e1df999680fc99c5da5f8 100644 (file)
--- a/fs/bcachefs/fs-io.c
+++ b/fs/bcachefs/fs-io.c
@@ -256,7 +256,7 @@ static int __bch2_truncate_folio(struct bch_inode_info *inode,
 
                folio = __filemap_get_folio(mapping, index,
                                            FGP_LOCK|FGP_CREAT, GFP_KERNEL);
-               if (IS_ERR_OR_NULL(folio)) {
+               if (IS_ERR(folio)) {
                        ret = -ENOMEM;
                        goto out;
                }