Commit ea1c9040 authored by Kaixu Xia's avatar Kaixu Xia Committed by Darrick J. Wong

xfs: remove unnecessary variable udqp from xfs_ioctl_setattr

The initial value of variable udqp is NULL, and we only set the
flag XFS_QMOPT_PQUOTA in xfs_qm_vop_dqalloc() function, so only
the pdqp value is initialized and the udqp value is still NULL.
Since the udqp value is NULL in the rest part of xfs_ioctl_setattr()
function, it is meaningless and do nothing. So remove it from
xfs_ioctl_setattr().
Signed-off-by: default avatarKaixu Xia <kaixuxia@tencent.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
parent fb353ff1
...@@ -1513,7 +1513,6 @@ xfs_ioctl_setattr( ...@@ -1513,7 +1513,6 @@ xfs_ioctl_setattr(
struct fsxattr old_fa; struct fsxattr old_fa;
struct xfs_mount *mp = ip->i_mount; struct xfs_mount *mp = ip->i_mount;
struct xfs_trans *tp; struct xfs_trans *tp;
struct xfs_dquot *udqp = NULL;
struct xfs_dquot *pdqp = NULL; struct xfs_dquot *pdqp = NULL;
struct xfs_dquot *olddquot = NULL; struct xfs_dquot *olddquot = NULL;
int code; int code;
...@@ -1536,7 +1535,7 @@ xfs_ioctl_setattr( ...@@ -1536,7 +1535,7 @@ xfs_ioctl_setattr(
if (XFS_IS_QUOTA_ON(mp)) { if (XFS_IS_QUOTA_ON(mp)) {
code = xfs_qm_vop_dqalloc(ip, VFS_I(ip)->i_uid, code = xfs_qm_vop_dqalloc(ip, VFS_I(ip)->i_uid,
VFS_I(ip)->i_gid, fa->fsx_projid, VFS_I(ip)->i_gid, fa->fsx_projid,
XFS_QMOPT_PQUOTA, &udqp, NULL, &pdqp); XFS_QMOPT_PQUOTA, NULL, NULL, &pdqp);
if (code) if (code)
return code; return code;
} }
...@@ -1560,7 +1559,7 @@ xfs_ioctl_setattr( ...@@ -1560,7 +1559,7 @@ xfs_ioctl_setattr(
if (XFS_IS_QUOTA_RUNNING(mp) && XFS_IS_PQUOTA_ON(mp) && if (XFS_IS_QUOTA_RUNNING(mp) && XFS_IS_PQUOTA_ON(mp) &&
ip->i_d.di_projid != fa->fsx_projid) { ip->i_d.di_projid != fa->fsx_projid) {
code = xfs_qm_vop_chown_reserve(tp, ip, udqp, NULL, pdqp, code = xfs_qm_vop_chown_reserve(tp, ip, NULL, NULL, pdqp,
capable(CAP_FOWNER) ? XFS_QMOPT_FORCE_RES : 0); capable(CAP_FOWNER) ? XFS_QMOPT_FORCE_RES : 0);
if (code) /* out of quota */ if (code) /* out of quota */
goto error_trans_cancel; goto error_trans_cancel;
...@@ -1626,7 +1625,6 @@ xfs_ioctl_setattr( ...@@ -1626,7 +1625,6 @@ xfs_ioctl_setattr(
* Release any dquot(s) the inode had kept before chown. * Release any dquot(s) the inode had kept before chown.
*/ */
xfs_qm_dqrele(olddquot); xfs_qm_dqrele(olddquot);
xfs_qm_dqrele(udqp);
xfs_qm_dqrele(pdqp); xfs_qm_dqrele(pdqp);
return code; return code;
...@@ -1634,7 +1632,6 @@ xfs_ioctl_setattr( ...@@ -1634,7 +1632,6 @@ xfs_ioctl_setattr(
error_trans_cancel: error_trans_cancel:
xfs_trans_cancel(tp); xfs_trans_cancel(tp);
error_free_dquots: error_free_dquots:
xfs_qm_dqrele(udqp);
xfs_qm_dqrele(pdqp); xfs_qm_dqrele(pdqp);
return code; return code;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment