summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKunwu Chan <chentao@kylinos.cn>2024-09-04 12:16:03 +0200
committerAndrew Morton <akpm@linux-foundation.org>2024-09-10 01:47:42 +0200
commitfd127b155523bbfaa91a5872f4d93a80f70b8238 (patch)
treeae6ea0495e675bacb53f6d9de7793dc99b8a5f9e
parentnilfs2: fix potential oob read in nilfs_btree_check_delete() (diff)
downloadlinux-fd127b155523bbfaa91a5872f4d93a80f70b8238.tar.xz
linux-fd127b155523bbfaa91a5872f4d93a80f70b8238.zip
nilfs2: remove duplicate 'unlikely()' usage
Nested unlikely() calls, IS_ERR already uses unlikely() internally Link: https://lkml.kernel.org/r/20240904101618.17716-1-konishi.ryusuke@gmail.com Signed-off-by: Kunwu Chan <chentao@kylinos.cn> Signed-off-by: Ryusuke Konishi <konishi.ryusuke@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Diffstat (limited to '')
-rw-r--r--fs/nilfs2/page.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nilfs2/page.c b/fs/nilfs2/page.c
index 7797903e014e..9c0b7cddeaae 100644
--- a/fs/nilfs2/page.c
+++ b/fs/nilfs2/page.c
@@ -262,7 +262,7 @@ repeat:
NILFS_FOLIO_BUG(folio, "inconsistent dirty state");
dfolio = filemap_grab_folio(dmap, folio->index);
- if (unlikely(IS_ERR(dfolio))) {
+ if (IS_ERR(dfolio)) {
/* No empty page is added to the page cache */
folio_unlock(folio);
err = PTR_ERR(dfolio);