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/nfs/objlayout/objio_osd.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/nfs/objlayout/objio_osd.c')
-rw-r--r-- | fs/nfs/objlayout/objio_osd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/objlayout/objio_osd.c b/fs/nfs/objlayout/objio_osd.c index 5aaed363556a..5c0c6b58157f 100644 --- a/fs/nfs/objlayout/objio_osd.c +++ b/fs/nfs/objlayout/objio_osd.c @@ -124,7 +124,7 @@ objio_alloc_deviceid_node(struct nfs_server *server, struct pnfs_device *pdev, retry_lookup: od = osduld_info_lookup(&odi); - if (unlikely(IS_ERR(od))) { + if (IS_ERR(od)) { err = PTR_ERR(od); dprintk("%s: osduld_info_lookup => %d\n", __func__, err); if (err == -ENODEV && retry_flag) { |