Message ID | 1600765442-12146-3-git-send-email-kaixuxia@tencent.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | xfs: random fixes for disk quota | expand |
On Tue, Sep 22, 2020 at 05:04:01PM +0800, xiakaixu1987@gmail.com wrote: > From: Kaixu Xia <kaixuxia@tencent.com> > > Since we never use the second parameter id, so remove it from > xfs_qm_dqattach_one() function. > > Signed-off-by: Kaixu Xia <kaixuxia@tencent.com> Heh, yep. Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com> --D > --- > fs/xfs/xfs_qm.c | 11 +++++------ > 1 file changed, 5 insertions(+), 6 deletions(-) > > diff --git a/fs/xfs/xfs_qm.c b/fs/xfs/xfs_qm.c > index 41a459ffd1f2..44509decb4cd 100644 > --- a/fs/xfs/xfs_qm.c > +++ b/fs/xfs/xfs_qm.c > @@ -249,7 +249,6 @@ xfs_qm_unmount_quotas( > STATIC int > xfs_qm_dqattach_one( > struct xfs_inode *ip, > - xfs_dqid_t id, > xfs_dqtype_t type, > bool doalloc, > struct xfs_dquot **IO_idqpp) > @@ -330,23 +329,23 @@ xfs_qm_dqattach_locked( > ASSERT(xfs_isilocked(ip, XFS_ILOCK_EXCL)); > > if (XFS_IS_UQUOTA_ON(mp) && !ip->i_udquot) { > - error = xfs_qm_dqattach_one(ip, i_uid_read(VFS_I(ip)), > - XFS_DQTYPE_USER, doalloc, &ip->i_udquot); > + error = xfs_qm_dqattach_one(ip, XFS_DQTYPE_USER, > + doalloc, &ip->i_udquot); > if (error) > goto done; > ASSERT(ip->i_udquot); > } > > if (XFS_IS_GQUOTA_ON(mp) && !ip->i_gdquot) { > - error = xfs_qm_dqattach_one(ip, i_gid_read(VFS_I(ip)), > - XFS_DQTYPE_GROUP, doalloc, &ip->i_gdquot); > + error = xfs_qm_dqattach_one(ip, XFS_DQTYPE_GROUP, > + doalloc, &ip->i_gdquot); > if (error) > goto done; > ASSERT(ip->i_gdquot); > } > > if (XFS_IS_PQUOTA_ON(mp) && !ip->i_pdquot) { > - error = xfs_qm_dqattach_one(ip, ip->i_d.di_projid, XFS_DQTYPE_PROJ, > + error = xfs_qm_dqattach_one(ip, XFS_DQTYPE_PROJ, > doalloc, &ip->i_pdquot); > if (error) > goto done; > -- > 2.20.0 >
On Tue, Sep 22, 2020 at 05:04:01PM +0800, xiakaixu1987@gmail.com wrote: > From: Kaixu Xia <kaixuxia@tencent.com> > > Since we never use the second parameter id, so remove it from > xfs_qm_dqattach_one() function. > > Signed-off-by: Kaixu Xia <kaixuxia@tencent.com> Looks good: Reviewed-by: Christoph Hellwig <hch@lst.de>
diff --git a/fs/xfs/xfs_qm.c b/fs/xfs/xfs_qm.c index 41a459ffd1f2..44509decb4cd 100644 --- a/fs/xfs/xfs_qm.c +++ b/fs/xfs/xfs_qm.c @@ -249,7 +249,6 @@ xfs_qm_unmount_quotas( STATIC int xfs_qm_dqattach_one( struct xfs_inode *ip, - xfs_dqid_t id, xfs_dqtype_t type, bool doalloc, struct xfs_dquot **IO_idqpp) @@ -330,23 +329,23 @@ xfs_qm_dqattach_locked( ASSERT(xfs_isilocked(ip, XFS_ILOCK_EXCL)); if (XFS_IS_UQUOTA_ON(mp) && !ip->i_udquot) { - error = xfs_qm_dqattach_one(ip, i_uid_read(VFS_I(ip)), - XFS_DQTYPE_USER, doalloc, &ip->i_udquot); + error = xfs_qm_dqattach_one(ip, XFS_DQTYPE_USER, + doalloc, &ip->i_udquot); if (error) goto done; ASSERT(ip->i_udquot); } if (XFS_IS_GQUOTA_ON(mp) && !ip->i_gdquot) { - error = xfs_qm_dqattach_one(ip, i_gid_read(VFS_I(ip)), - XFS_DQTYPE_GROUP, doalloc, &ip->i_gdquot); + error = xfs_qm_dqattach_one(ip, XFS_DQTYPE_GROUP, + doalloc, &ip->i_gdquot); if (error) goto done; ASSERT(ip->i_gdquot); } if (XFS_IS_PQUOTA_ON(mp) && !ip->i_pdquot) { - error = xfs_qm_dqattach_one(ip, ip->i_d.di_projid, XFS_DQTYPE_PROJ, + error = xfs_qm_dqattach_one(ip, XFS_DQTYPE_PROJ, doalloc, &ip->i_pdquot); if (error) goto done;