summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHirofumi Nakagawa <nklabs@gmail.com>2017-09-25 20:21:26 +0200
committerAl Viro <viro@zeniv.linux.org.uk>2017-11-06 00:30:49 +0100
commit684e73bee4b5ef626a017c101a20f91cf28a75e6 (patch)
tree20eaedebf3239567006083e3fbe0a296974eb660
parentstubs for mount_bdev() and kill_block_super() in !CONFIG_BLOCK case (diff)
downloadlinux-684e73bee4b5ef626a017c101a20f91cf28a75e6.tar.xz
linux-684e73bee4b5ef626a017c101a20f91cf28a75e6.zip
vfs: remove unneeded unlikely()
IS_ERR() macro it is already including unlikely(). Signed-off-by: Hirofumi Nakagawa <nklabs@gmail.com> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
-rw-r--r--fs/namei.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/namei.c b/fs/namei.c
index c75ea03ca147..00384488fda1 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -3458,7 +3458,7 @@ static int do_tmpfile(struct nameidata *nd, unsigned flags,
goto out;
child = vfs_tmpfile(path.dentry, op->mode, op->open_flag);
error = PTR_ERR(child);
- if (unlikely(IS_ERR(child)))
+ if (IS_ERR(child))
goto out2;
dput(path.dentry);
path.dentry = child;