forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fs: Drop unlikely before IS_ERR(_OR_NULL)

Browse source 
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>
This commit is contained in:
Viresh Kumar 2015-08-12 15:59:44 +05:30 • committed by Jiri Kosina
parent bf69a3b60e
commit a1c83681d5
8 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
fs/namei.c
View file

@ -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);