Commit c8d329f3 authored by Eric Sandeen's avatar Eric Sandeen Committed by Darrick J. Wong

xfs: group quota should return EDQUOT when prj quota enabled

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: default avatarEric Sandeen <sandeen@redhat.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarBrian Foster <bfoster@redhat.com>
Reviewed-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
parent b41b46c2
...@@ -758,7 +758,8 @@ xfs_trans_reserve_quota_bydquots( ...@@ -758,7 +758,8 @@ xfs_trans_reserve_quota_bydquots(
} }
if (gdqp) { 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) if (error)
goto unwind_usr; goto unwind_usr;
} }
......
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