]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
nilfs2: remove duplicate 'unlikely()' usage
authorKunwu Chan <chentao@kylinos.cn>
Wed, 4 Sep 2024 10:16:03 +0000 (19:16 +0900)
committerAndrew Morton <akpm@linux-foundation.org>
Mon, 9 Sep 2024 23:47:42 +0000 (16:47 -0700)
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>
fs/nilfs2/page.c

index 7797903e014e997552358f55542df7e526133357..9c0b7cddeaaeedf3e6197a1ddc9a8833857b2ec6 100644 (file)
@@ -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);