xfs: remove unnecessary variable udqp from xfs_ioctl_setattr
authorKaixu Xia <kaixuxia@tencent.com>
Thu, 23 Apr 2020 04:54:29 +0000 (21:54 -0700)
committerDarrick J. Wong <darrick.wong@oracle.com>
Mon, 4 May 2020 16:03:14 +0000 (09:03 -0700)
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: Kaixu Xia <kaixuxia@tencent.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
fs/xfs/xfs_ioctl.c

index 309958186d338099cf52e7d9a8a3ce579c626a20..91936ed5e334695b9c083c6934241098be1ac461 100644 (file)
@@ -1513,7 +1513,6 @@ xfs_ioctl_setattr(
        struct fsxattr          old_fa;
        struct xfs_mount        *mp = ip->i_mount;
        struct xfs_trans        *tp;
-       struct xfs_dquot        *udqp = NULL;
        struct xfs_dquot        *pdqp = NULL;
        struct xfs_dquot        *olddquot = NULL;
        int                     code;
@@ -1536,7 +1535,7 @@ xfs_ioctl_setattr(
        if (XFS_IS_QUOTA_ON(mp)) {
                code = xfs_qm_vop_dqalloc(ip, VFS_I(ip)->i_uid,
                                VFS_I(ip)->i_gid, fa->fsx_projid,
-                               XFS_QMOPT_PQUOTA, &udqp, NULL, &pdqp);
+                               XFS_QMOPT_PQUOTA, NULL, NULL, &pdqp);
                if (code)
                        return code;
        }
@@ -1560,7 +1559,7 @@ xfs_ioctl_setattr(
 
        if (XFS_IS_QUOTA_RUNNING(mp) && XFS_IS_PQUOTA_ON(mp) &&
            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);
                if (code)       /* out of quota */
                        goto error_trans_cancel;
@@ -1626,7 +1625,6 @@ xfs_ioctl_setattr(
         * Release any dquot(s) the inode had kept before chown.
         */
        xfs_qm_dqrele(olddquot);
-       xfs_qm_dqrele(udqp);
        xfs_qm_dqrele(pdqp);
 
        return code;
@@ -1634,7 +1632,6 @@ xfs_ioctl_setattr(
 error_trans_cancel:
        xfs_trans_cancel(tp);
 error_free_dquots:
-       xfs_qm_dqrele(udqp);
        xfs_qm_dqrele(pdqp);
        return code;
 }