63 lines
2.1 KiB
Diff
63 lines
2.1 KiB
Diff
From 0fe251fd827271cb8d40490db395ca9c58a21509 Mon Sep 17 00:00:00 2001
|
|
From: Youling Tang <tangyouling@kylinos.cn>
|
|
Date: Tue, 24 Sep 2024 10:53:50 +0800
|
|
Subject: [PATCH 071/233] bcachefs: Removes NULL pointer checks for
|
|
__filemap_get_folio return values
|
|
Content-Type: text/plain; charset="utf-8"
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
__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>
|
|
Signed-off-by: Alexander Miroshnichenko <alex@millerson.name>
|
|
---
|
|
fs/bcachefs/fs-io-buffered.c | 2 +-
|
|
fs/bcachefs/fs-io-pagecache.c | 2 +-
|
|
fs/bcachefs/fs-io.c | 2 +-
|
|
3 files changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/fs/bcachefs/fs-io-buffered.c b/fs/bcachefs/fs-io-buffered.c
|
|
index 0923f38a2fcd..b853cecd3c1b 100644
|
|
--- 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 51a499c5a7b6..e072900e6a5b 100644
|
|
--- 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 0021db191480..c6fdfec51082 100644
|
|
--- 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;
|
|
}
|
|
--
|
|
2.45.2
|
|
|