On Mon, Feb 01, 2021 at 06:04:43PM -0800, Darrick J. Wong wrote:
> From: Darrick J. Wong <djwong@xxxxxxxxxx>
>
> Rename the 'code' variable to 'error' to follow the naming convention of
> most other functions in xfs.
>
> Signed-off-by: Darrick J. Wong <djwong@xxxxxxxxxx>
> Reviewed-by: Chaitanya Kulkarni <chaitanya.kulkarni@xxxxxxx>
> Reviewed-by: Christoph Hellwig <hch@xxxxxx>
> ---
Reviewed-by: Brian Foster <bfoster@xxxxxxxxxx>
> fs/xfs/xfs_ioctl.c | 38 +++++++++++++++++++-------------------
> 1 file changed, 19 insertions(+), 19 deletions(-)
>
>
> diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c
> index 78ee201eb7cb..38ee66d999d8 100644
> --- a/fs/xfs/xfs_ioctl.c
> +++ b/fs/xfs/xfs_ioctl.c
> @@ -1435,13 +1435,13 @@ xfs_ioctl_setattr(
> struct xfs_trans *tp;
> struct xfs_dquot *pdqp = NULL;
> struct xfs_dquot *olddquot = NULL;
> - int code;
> + int error;
>
> trace_xfs_ioctl_setattr(ip);
>
> - code = xfs_ioctl_setattr_check_projid(ip, fa);
> - if (code)
> - return code;
> + error = xfs_ioctl_setattr_check_projid(ip, fa);
> + if (error)
> + return error;
>
> /*
> * If disk quotas is on, we make sure that the dquots do exist on disk,
> @@ -1452,36 +1452,36 @@ xfs_ioctl_setattr(
> * because the i_*dquot fields will get updated anyway.
> */
> if (XFS_IS_QUOTA_ON(mp)) {
> - code = xfs_qm_vop_dqalloc(ip, VFS_I(ip)->i_uid,
> + error = xfs_qm_vop_dqalloc(ip, VFS_I(ip)->i_uid,
> VFS_I(ip)->i_gid, fa->fsx_projid,
> XFS_QMOPT_PQUOTA, NULL, NULL, &pdqp);
> - if (code)
> - return code;
> + if (error)
> + return error;
> }
>
> xfs_ioctl_setattr_prepare_dax(ip, fa);
>
> tp = xfs_ioctl_setattr_get_trans(ip, pdqp);
> if (IS_ERR(tp)) {
> - code = PTR_ERR(tp);
> + error = PTR_ERR(tp);
> goto error_free_dquots;
> }
>
> xfs_fill_fsxattr(ip, false, &old_fa);
> - code = vfs_ioc_fssetxattr_check(VFS_I(ip), &old_fa, fa);
> - if (code)
> + error = vfs_ioc_fssetxattr_check(VFS_I(ip), &old_fa, fa);
> + if (error)
> goto error_trans_cancel;
>
> - code = xfs_ioctl_setattr_check_extsize(ip, fa);
> - if (code)
> + error = xfs_ioctl_setattr_check_extsize(ip, fa);
> + if (error)
> goto error_trans_cancel;
>
> - code = xfs_ioctl_setattr_check_cowextsize(ip, fa);
> - if (code)
> + error = xfs_ioctl_setattr_check_cowextsize(ip, fa);
> + if (error)
> goto error_trans_cancel;
>
> - code = xfs_ioctl_setattr_xflags(tp, ip, fa);
> - if (code)
> + error = xfs_ioctl_setattr_xflags(tp, ip, fa);
> + if (error)
> goto error_trans_cancel;
>
> /*
> @@ -1521,7 +1521,7 @@ xfs_ioctl_setattr(
> else
> ip->i_d.di_cowextsize = 0;
>
> - code = xfs_trans_commit(tp);
> + error = xfs_trans_commit(tp);
>
> /*
> * Release any dquot(s) the inode had kept before chown.
> @@ -1529,13 +1529,13 @@ xfs_ioctl_setattr(
> xfs_qm_dqrele(olddquot);
> xfs_qm_dqrele(pdqp);
>
> - return code;
> + return error;
>
> error_trans_cancel:
> xfs_trans_cancel(tp);
> error_free_dquots:
> xfs_qm_dqrele(pdqp);
> - return code;
> + return error;
> }
>
> STATIC int
>
