proxmox-mirrors/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs synced 2025-04-28 06:00:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Enforce default quotas when no per-ID quota is set

Browse Source 
Update zfs_id_overobjquota() and zfs_id_overblockquota() to enforce
default user/group/project quotas (block and object-based) when no
per-user, per-group, or per-project quota exists. If a specific quota
is not configured for an ID, the default quota value is applied.

Signed-off-by: Ameer Hamza <ahamza@ixsystems.com>

Reviewed-by: Alexander Motin <mav@FreeBSD.org>
Reviewed-by: Tony Hutter <hutter2@llnl.gov>
This commit is contained in:
Ameer Hamza 2025-03-10 00:07:31 +05:00 committed by Tony Hutter
parent 2a8d9d9607
commit 20705a8430
1 changed files with 28 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
module/zfs/zfs_quota.c
View File

@ -373,7 +373,7 @@ boolean_t
zfs_id_overobjquota(zfsvfs_t *zfsvfs, uint64_t usedobj, uint64_t id)
{
char buf[20 + DMU_OBJACCT_PREFIX_LEN];
uint64_t used, quota, quotaobj;
uint64_t used, quota, quotaobj, default_quota = 0;
int err;
if (!dmu_objset_userobjspace_present(zfsvfs->z_os)) {
@ -399,20 +399,29 @@ zfs_id_overobjquota(zfsvfs_t *zfsvfs, uint64_t usedobj, uint64_t id)
return (B_FALSE);
}
quotaobj = zfsvfs->z_projectobjquota_obj;
default_quota = zfsvfs->z_defaultprojectobjquota;
} else if (usedobj == DMU_USERUSED_OBJECT) {
quotaobj = zfsvfs->z_userobjquota_obj;
default_quota = zfsvfs->z_defaultuserobjquota;
} else if (usedobj == DMU_GROUPUSED_OBJECT) {
quotaobj = zfsvfs->z_groupobjquota_obj;
default_quota = zfsvfs->z_defaultgroupobjquota;
} else {
return (B_FALSE);
}
if (quotaobj == 0 || zfsvfs->z_replay)
if (zfsvfs->z_replay)
return (B_FALSE);
(void) snprintf(buf, sizeof (buf), "%llx", (longlong_t)id);
err = zap_lookup(zfsvfs->z_os, quotaobj, buf, 8, 1, &quota);
if (err != 0)
return (B_FALSE);
if (quotaobj == 0) {
if (default_quota == 0)
return (B_FALSE);
quota = default_quota;
} else {
err = zap_lookup(zfsvfs->z_os, quotaobj, buf, 8, 1, &quota);
if (err != 0 && ((quota = default_quota) == 0))
return (B_FALSE);
}
(void) snprintf(buf, sizeof (buf), DMU_OBJACCT_PREFIX "%llx",
(longlong_t)id);
@ -426,7 +435,7 @@ boolean_t
zfs_id_overblockquota(zfsvfs_t *zfsvfs, uint64_t usedobj, uint64_t id)
{
char buf[20];
uint64_t used, quota, quotaobj;
uint64_t used, quota, quotaobj, default_quota = 0;
int err;
if (usedobj == DMU_PROJECTUSED_OBJECT) {
@ -441,20 +450,29 @@ zfs_id_overblockquota(zfsvfs_t *zfsvfs, uint64_t usedobj, uint64_t id)
return (B_FALSE);
}
quotaobj = zfsvfs->z_projectquota_obj;
default_quota = zfsvfs->z_defaultprojectquota;
} else if (usedobj == DMU_USERUSED_OBJECT) {
quotaobj = zfsvfs->z_userquota_obj;
default_quota = zfsvfs->z_defaultuserquota;
} else if (usedobj == DMU_GROUPUSED_OBJECT) {
quotaobj = zfsvfs->z_groupquota_obj;
default_quota = zfsvfs->z_defaultgroupquota;
} else {
return (B_FALSE);
}
if (quotaobj == 0 || zfsvfs->z_replay)
if (zfsvfs->z_replay)
return (B_FALSE);
(void) snprintf(buf, sizeof (buf), "%llx", (longlong_t)id);
err = zap_lookup(zfsvfs->z_os, quotaobj, buf, 8, 1, &quota);
if (err != 0)
return (B_FALSE);
if (quotaobj == 0) {
if (default_quota == 0)
return (B_FALSE);
quota = default_quota;
} else {
err = zap_lookup(zfsvfs->z_os, quotaobj, buf, 8, 1, &quota);
if (err != 0 && ((quota = default_quota) == 0))
return (B_FALSE);
}
err = zap_lookup(zfsvfs->z_os, usedobj, buf, 8, 1, &used);
if (err != 0)