| Message ID | 1381782256-2434-2-git-send-email-geyslan@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
2013/10/14 Geyslan G. Bem <geyslan@gmail.com>: > Use 'PTR_ERR_OR_ZERO()' rather than 'IS_ERR(...) ? PTR_ERR(...) : 0'. > > Signed-off-by: Geyslan G. Bem <geyslan@gmail.com> > --- > fs/nfs/nfs4super.c | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > > diff --git a/fs/nfs/nfs4super.c b/fs/nfs/nfs4super.c > index e26acdd..65ab0a0 100644 > --- a/fs/nfs/nfs4super.c > +++ b/fs/nfs/nfs4super.c > @@ -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; > } > > -- > 1.8.4 > In this version (v2): Format changed from %ld to %d. -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/fs/nfs/nfs4super.c b/fs/nfs/nfs4super.c index e26acdd..65ab0a0 100644 --- a/fs/nfs/nfs4super.c +++ b/fs/nfs/nfs4super.c @@ -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; }
Use 'PTR_ERR_OR_ZERO()' rather than 'IS_ERR(...) ? PTR_ERR(...) : 0'. Signed-off-by: Geyslan G. Bem <geyslan@gmail.com> --- fs/nfs/nfs4super.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)