From: Hirofumi Nakagawa <nklabs@gmail.com>
Date: Mon, 25 Sep 2017 18:21:26 +0000 (+0900)
Subject: vfs: remove unneeded unlikely()
X-Git-Tag: v4.15-rc1~66^2~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=684e73bee4b5ef626a017c101a20f91cf28a75e6;p=thirdparty%2Fkernel%2Flinux.git

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>
---

diff --git a/fs/namei.c b/fs/namei.c
index c75ea03ca147e..00384488fda1f 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;