| Message ID | 70119485-992a-641d-93ab-a9d41f9618d5@redhat.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | xfs: quota timer enhancements | expand |
On Mon, May 18, 2020 at 01:48:46PM -0500, Eric Sandeen wrote: > Long ago, group & project quota were mutually exclusive, and so > when we turned on XFS_QMOPT_ENOSPC ("return ENOSPC if project quota > is exceeded") when project quota was enabled, we only needed to > disable it again for user quota. > > When group & project quota got separated, this got missed, and as a > result if project quota is enabled and group quota is exceeded, the > error code returned is incorrectly returned as ENOSPC not EDQUOT. > > Fix this by stripping XFS_QMOPT_ENOSPC out of flags for group > quota when we try to reserve the space. > > Signed-off-by: Eric Sandeen <sandeen@redhat.com> > Reviewed-by: Christoph Hellwig <hch@lst.de> > Reviewed-by: Brian Foster <bfoster@redhat.com> Looks ok, Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com> --D > --- > fs/xfs/xfs_trans_dquot.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/fs/xfs/xfs_trans_dquot.c b/fs/xfs/xfs_trans_dquot.c > index d1b9869bc5fa..2c3557a80e69 100644 > --- a/fs/xfs/xfs_trans_dquot.c > +++ b/fs/xfs/xfs_trans_dquot.c > @@ -758,7 +758,8 @@ xfs_trans_reserve_quota_bydquots( > } > > if (gdqp) { > - error = xfs_trans_dqresv(tp, mp, gdqp, nblks, ninos, flags); > + error = xfs_trans_dqresv(tp, mp, gdqp, nblks, ninos, > + (flags & ~XFS_QMOPT_ENOSPC)); > if (error) > goto unwind_usr; > } > -- > 2.17.0 >
diff --git a/fs/xfs/xfs_trans_dquot.c b/fs/xfs/xfs_trans_dquot.c index d1b9869bc5fa..2c3557a80e69 100644 --- a/fs/xfs/xfs_trans_dquot.c +++ b/fs/xfs/xfs_trans_dquot.c @@ -758,7 +758,8 @@ xfs_trans_reserve_quota_bydquots( } if (gdqp) { - error = xfs_trans_dqresv(tp, mp, gdqp, nblks, ninos, flags); + error = xfs_trans_dqresv(tp, mp, gdqp, nblks, ninos, + (flags & ~XFS_QMOPT_ENOSPC)); if (error) goto unwind_usr; }
Long ago, group & project quota were mutually exclusive, and so when we turned on XFS_QMOPT_ENOSPC ("return ENOSPC if project quota is exceeded") when project quota was enabled, we only needed to disable it again for user quota. When group & project quota got separated, this got missed, and as a result if project quota is enabled and group quota is exceeded, the error code returned is incorrectly returned as ENOSPC not EDQUOT. Fix this by stripping XFS_QMOPT_ENOSPC out of flags for group quota when we try to reserve the space. Signed-off-by: Eric Sandeen <sandeen@redhat.com> Reviewed-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Brian Foster <bfoster@redhat.com> --- fs/xfs/xfs_trans_dquot.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)