summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorDenis Efremov <efremov@linux.com>2019-09-26 02:49:31 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2019-09-26 20:10:30 +0300
commit7159d54418e0a1a3df91e74501363a1c05379517 (patch)
treed653219453f5d7d4fd59e1f23e6579777af0bde6 /fs
parent89f403541325181748b491fd96118e68292f47e1 (diff)
downloadlinux-7159d54418e0a1a3df91e74501363a1c05379517.tar.xz
fs: remove unlikely() from WARN_ON() condition
"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>
Diffstat (limited to 'fs')
-rw-r--r--fs/open.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/open.c b/fs/open.c
index c60cd22cc052..b62f5c0923a8 100644
--- 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;
}