nfs: Use PTR_ERR_OR_ZERO in 'nfs/nfs4super.c'
authorGeyslan G. Bem <geyslan@gmail.com>
Mon, 14 Oct 2013 20:24:16 +0000 (17:24 -0300)
committerTrond Myklebust <Trond.Myklebust@netapp.com>
Mon, 28 Oct 2013 22:16:56 +0000 (18:16 -0400)
Use 'PTR_ERR_OR_ZERO()' rather than 'IS_ERR(...) ? PTR_ERR(...) : 0'.

Signed-off-by: Geyslan G. Bem <geyslan@gmail.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
fs/nfs/nfs4super.c

index e26acdd..65ab0a0 100644 (file)
@@ -261,9 +261,9 @@ struct dentry *nfs4_try_mount(int flags, const char *dev_name,
 
        res = nfs_follow_remote_path(root_mnt, export_path);
 
-       dfprintk(MOUNT, "<-- nfs4_try_mount() = %ld%s\n",
-                       IS_ERR(res) ? PTR_ERR(res) : 0,
-                       IS_ERR(res) ? " [error]" : "");
+       dfprintk(MOUNT, "<-- nfs4_try_mount() = %d%s\n",
+                PTR_ERR_OR_ZERO(res),
+                IS_ERR(res) ? " [error]" : "");
        return res;
 }
 
@@ -319,9 +319,9 @@ static struct dentry *nfs4_referral_mount(struct file_system_type *fs_type,
        data->mnt_path = export_path;
 
        res = nfs_follow_remote_path(root_mnt, export_path);
-       dprintk("<-- nfs4_referral_mount() = %ld%s\n",
-                       IS_ERR(res) ? PTR_ERR(res) : 0,
-                       IS_ERR(res) ? " [error]" : "");
+       dprintk("<-- nfs4_referral_mount() = %d%s\n",
+               PTR_ERR_OR_ZERO(res),
+               IS_ERR(res) ? " [error]" : "");
        return res;
 }