fs: remove unlikely() from WARN_ON() condition
authorDenis Efremov <efremov@linux.com>
Wed, 25 Sep 2019 23:49:31 +0000 (16:49 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 26 Sep 2019 17:10:30 +0000 (10:10 -0700)
"unlikely(WARN_ON(x))" is excessive. WARN_ON() already uses unlikely()
internally.

Link: http://lkml.kernel.org/r/20190829165025.15750-5-efremov@linux.com
Signed-off-by: Denis Efremov <efremov@linux.com>
Cc: Alexander Viro <viro@zeniv.linux.org.uk>
Cc: Joe Perches <joe@perches.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
fs/open.c

index c60cd22cc052a41d2e0b2b1f954051268ae10bf8..b62f5c0923a80cc168904b940e564fb2721a4f40 100644 (file)
--- a/fs/open.c
+++ b/fs/open.c
@@ -776,7 +776,7 @@ static int do_dentry_open(struct file *f,
                f->f_mode |= FMODE_ATOMIC_POS;
 
        f->f_op = fops_get(inode->i_fop);
-       if (unlikely(WARN_ON(!f->f_op))) {
+       if (WARN_ON(!f->f_op)) {
                error = -ENODEV;
                goto cleanup_all;
        }