xfs: return default quota limits for IDs without a dquot
When an ID has no dquot on disk, Q_XGETQUOTA returns -ENOENT even though default quota limits are configured and enforced against that ID. This means unprivileged users who have never used any resources cannot see the limits that apply to them. When xfs_qm_dqget() returns -ENOENT for a non-zero ID, return a zero-usage response with the default limits filled in from m_quotainfo rather than propagating the error. This is consistent with the enforcement behavior in xfs_qm_adjust_dqlimits(), which pushes the same default limits into a dquot when it is first allocated. Reviewed-by: Jan Kara <jack@suse.cz> Signed-off-by: Ravi Singh <ravising@redhat.com> Reviewed-by: Carlos Maiolino <cmaiolino@redhat.com> Reviewed-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Darrick J. Wong <djwong@kernel.org> Signed-off-by: Carlos Maiolino <cem@kernel.org>
This commit is contained in:
parent
181ea4e2de
commit
7338419a5e
1 changed files with 42 additions and 1 deletions
|
|
@ -391,6 +391,38 @@ out_rele:
|
|||
return error;
|
||||
}
|
||||
|
||||
/*
|
||||
* Fill out the default quota limits for an ID that has no dquot on disk.
|
||||
* Returns 0 if default limits are configured
|
||||
* and were filled in, -ENOENT otherwise.
|
||||
*/
|
||||
static int
|
||||
xfs_qm_scall_getquota_fill_defaults(
|
||||
struct xfs_mount *mp,
|
||||
xfs_dqtype_t type,
|
||||
struct qc_dqblk *dst)
|
||||
{
|
||||
struct xfs_def_quota *defq;
|
||||
|
||||
defq = xfs_get_defquota(mp->m_quotainfo, type);
|
||||
|
||||
if (!defq->blk.soft && !defq->blk.hard &&
|
||||
!defq->ino.soft && !defq->ino.hard &&
|
||||
!defq->rtb.soft && !defq->rtb.hard) {
|
||||
return -ENOENT;
|
||||
}
|
||||
|
||||
memset(dst, 0, sizeof(*dst));
|
||||
dst->d_spc_softlimit = XFS_FSB_TO_B(mp, defq->blk.soft);
|
||||
dst->d_spc_hardlimit = XFS_FSB_TO_B(mp, defq->blk.hard);
|
||||
dst->d_ino_softlimit = defq->ino.soft;
|
||||
dst->d_ino_hardlimit = defq->ino.hard;
|
||||
dst->d_rt_spc_softlimit = XFS_FSB_TO_B(mp, defq->rtb.soft);
|
||||
dst->d_rt_spc_hardlimit = XFS_FSB_TO_B(mp, defq->rtb.hard);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* Fill out the quota context. */
|
||||
static void
|
||||
xfs_qm_scall_getquota_fill_qc(
|
||||
|
|
@ -451,8 +483,17 @@ xfs_qm_scall_getquota(
|
|||
* set doalloc. If it doesn't exist, we'll get ENOENT back.
|
||||
*/
|
||||
error = xfs_qm_dqget(mp, id, type, false, &dqp);
|
||||
if (error)
|
||||
if (error) {
|
||||
/*
|
||||
* If there is no dquot on disk and default limits are
|
||||
* configured, return them with zero usage so that
|
||||
* unprivileged users can see what limits apply to them.
|
||||
*/
|
||||
if (error == -ENOENT && id != 0 &&
|
||||
!xfs_qm_scall_getquota_fill_defaults(mp, type, dst))
|
||||
return 0;
|
||||
return error;
|
||||
}
|
||||
|
||||
/*
|
||||
* If everything's NULL, this dquot doesn't quite exist as far as
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue