diff options
| author | Viresh Kumar <viresh.kumar@linaro.org> | 2015-08-12 15:59:44 +0530 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2015-09-29 15:13:58 +0200 |
| commit | a1c83681d52704c766d576bea2d7f2f99e8dde23 (patch) | |
| tree | 7439a3502559d447c21d5aabfbd483f456d0ec66 /fs/namei.c | |
| parent | bf69a3b60e4d892f8c1d7a6b18cf84aaa7acd43f (diff) | |
| download | linux-a1c83681d52704c766d576bea2d7f2f99e8dde23.tar.bz2 | |
fs: Drop unlikely before IS_ERR(_OR_NULL)
IS_ERR(_OR_NULL) already contain an 'unlikely' compiler flag and there
is no need to do that again from its callers. Drop it.
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Reviewed-by: Jeff Layton <jlayton@poochiereds.net>
Reviewed-by: David Howells <dhowells@redhat.com>
Reviewed-by: Steve French <smfrench@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'fs/namei.c')
| -rw-r--r-- | fs/namei.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/namei.c b/fs/namei.c index fbbcf0993312..d3f84069a9aa 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -1942,7 +1942,7 @@ OK: if (err) { const char *s = get_link(nd); - if (unlikely(IS_ERR(s))) + if (IS_ERR(s)) return PTR_ERR(s); err = 0; if (unlikely(!s)) { @@ -3356,7 +3356,7 @@ struct file *do_file_open_root(struct dentry *dentry, struct vfsmount *mnt, return ERR_PTR(-ELOOP); filename = getname_kernel(name); - if (unlikely(IS_ERR(filename))) + if (IS_ERR(filename)) return ERR_CAST(filename); set_nameidata(&nd, -1, filename); |