|
 |
ffb978 |
From d8a9454608ff97e98fb7de0da28f8d40804d2296 Mon Sep 17 00:00:00 2001
|
|
|
ffb978 |
From: Bill O'Donnell <billodo@redhat.com>
|
|
|
ffb978 |
Date: Mon, 24 Aug 2020 13:23:43 -0400
|
|
|
ffb978 |
Subject: [PATCH] xfs_quota: state command should report ugp grace times
|
|
|
ffb978 |
|
|
|
ffb978 |
Since grace periods are now supported for three quota types (ugp),
|
|
|
ffb978 |
modify xfs_quota state command to report times for all three.
|
|
|
ffb978 |
Add a helper function for stat reporting.
|
|
|
ffb978 |
|
|
|
ffb978 |
Signed-off-by: Bill O'Donnell <billodo@redhat.com>
|
|
|
ffb978 |
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
|
|
|
ffb978 |
Reviewed-by: Christoph Hellwig <hch@lst.de>
|
|
|
ffb978 |
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
|
|
|
ffb978 |
---
|
|
|
ffb978 |
quota/state.c | 96 +++++++++++++++++++++++++++++++++++----------------
|
|
|
ffb978 |
1 file changed, 67 insertions(+), 29 deletions(-)
|
|
|
ffb978 |
|
|
|
ffb978 |
diff --git a/quota/state.c b/quota/state.c
|
|
|
ffb978 |
index 1627181d..19d34ed0 100644
|
|
|
ffb978 |
--- a/quota/state.c
|
|
|
ffb978 |
+++ b/quota/state.c
|
|
|
ffb978 |
@@ -191,49 +191,87 @@ state_stat_to_statv(
|
|
|
ffb978 |
}
|
|
|
ffb978 |
|
|
|
ffb978 |
static void
|
|
|
ffb978 |
-state_quotafile_mount(
|
|
|
ffb978 |
+state_quotafile_stat(
|
|
|
ffb978 |
FILE *fp,
|
|
|
ffb978 |
uint type,
|
|
|
ffb978 |
- struct fs_path *mount,
|
|
|
ffb978 |
+ struct fs_path *mount,
|
|
|
ffb978 |
+ struct fs_quota_statv *sv,
|
|
|
ffb978 |
+ struct fs_quota_stat *s,
|
|
|
ffb978 |
uint flags)
|
|
|
ffb978 |
{
|
|
|
ffb978 |
- struct fs_quota_stat s;
|
|
|
ffb978 |
- struct fs_quota_statv sv;
|
|
|
ffb978 |
+ bool accounting, enforcing;
|
|
|
ffb978 |
+ struct fs_qfilestatv *qsv;
|
|
|
ffb978 |
char *dev = mount->fs_name;
|
|
|
ffb978 |
|
|
|
ffb978 |
- sv.qs_version = FS_QSTATV_VERSION1;
|
|
|
ffb978 |
-
|
|
|
ffb978 |
- if (xfsquotactl(XFS_GETQSTATV, dev, type, 0, (void *)&sv) < 0) {
|
|
|
ffb978 |
- if (xfsquotactl(XFS_GETQSTAT, dev, type, 0, (void *)&s) < 0) {
|
|
|
ffb978 |
+ if (xfsquotactl(XFS_GETQSTATV, dev, type, 0, (void *)sv) < 0) {
|
|
|
ffb978 |
+ if (xfsquotactl(XFS_GETQSTAT, dev, type, 0, (void *)s) < 0) {
|
|
|
ffb978 |
if (flags & VERBOSE_FLAG)
|
|
|
ffb978 |
fprintf(fp,
|
|
|
ffb978 |
_("%s quota are not enabled on %s\n"),
|
|
|
ffb978 |
type_to_string(type), dev);
|
|
|
ffb978 |
return;
|
|
|
ffb978 |
}
|
|
|
ffb978 |
- state_stat_to_statv(&s, &sv;;
|
|
|
ffb978 |
+ state_stat_to_statv(s, sv);
|
|
|
ffb978 |
+ }
|
|
|
ffb978 |
+
|
|
|
ffb978 |
+ switch(type) {
|
|
|
ffb978 |
+ case XFS_USER_QUOTA:
|
|
|
ffb978 |
+ qsv = &sv->qs_uquota;
|
|
|
ffb978 |
+ accounting = sv->qs_flags & XFS_QUOTA_UDQ_ACCT;
|
|
|
ffb978 |
+ enforcing = sv->qs_flags & XFS_QUOTA_UDQ_ENFD;
|
|
|
ffb978 |
+ break;
|
|
|
ffb978 |
+ case XFS_GROUP_QUOTA:
|
|
|
ffb978 |
+ qsv = &sv->qs_gquota;
|
|
|
ffb978 |
+ accounting = sv->qs_flags & XFS_QUOTA_GDQ_ACCT;
|
|
|
ffb978 |
+ enforcing = sv->qs_flags & XFS_QUOTA_GDQ_ENFD;
|
|
|
ffb978 |
+ break;
|
|
|
ffb978 |
+ case XFS_PROJ_QUOTA:
|
|
|
ffb978 |
+ qsv = &sv->qs_pquota;
|
|
|
ffb978 |
+ accounting = sv->qs_flags & XFS_QUOTA_PDQ_ACCT;
|
|
|
ffb978 |
+ enforcing = sv->qs_flags & XFS_QUOTA_PDQ_ENFD;
|
|
|
ffb978 |
+ break;
|
|
|
ffb978 |
+ default:
|
|
|
ffb978 |
+ return;
|
|
|
ffb978 |
}
|
|
|
ffb978 |
|
|
|
ffb978 |
- if (type & XFS_USER_QUOTA)
|
|
|
ffb978 |
- state_qfilestat(fp, mount, XFS_USER_QUOTA, &sv.qs_uquota,
|
|
|
ffb978 |
- sv.qs_flags & XFS_QUOTA_UDQ_ACCT,
|
|
|
ffb978 |
- sv.qs_flags & XFS_QUOTA_UDQ_ENFD);
|
|
|
ffb978 |
- if (type & XFS_GROUP_QUOTA)
|
|
|
ffb978 |
- state_qfilestat(fp, mount, XFS_GROUP_QUOTA, &sv.qs_gquota,
|
|
|
ffb978 |
- sv.qs_flags & XFS_QUOTA_GDQ_ACCT,
|
|
|
ffb978 |
- sv.qs_flags & XFS_QUOTA_GDQ_ENFD);
|
|
|
ffb978 |
- if (type & XFS_PROJ_QUOTA)
|
|
|
ffb978 |
- state_qfilestat(fp, mount, XFS_PROJ_QUOTA, &sv.qs_pquota,
|
|
|
ffb978 |
- sv.qs_flags & XFS_QUOTA_PDQ_ACCT,
|
|
|
ffb978 |
- sv.qs_flags & XFS_QUOTA_PDQ_ENFD);
|
|
|
ffb978 |
-
|
|
|
ffb978 |
- state_timelimit(fp, XFS_BLOCK_QUOTA, sv.qs_btimelimit);
|
|
|
ffb978 |
- state_warnlimit(fp, XFS_BLOCK_QUOTA, sv.qs_bwarnlimit);
|
|
|
ffb978 |
-
|
|
|
ffb978 |
- state_timelimit(fp, XFS_INODE_QUOTA, sv.qs_itimelimit);
|
|
|
ffb978 |
- state_warnlimit(fp, XFS_INODE_QUOTA, sv.qs_iwarnlimit);
|
|
|
ffb978 |
-
|
|
|
ffb978 |
- state_timelimit(fp, XFS_RTBLOCK_QUOTA, sv.qs_rtbtimelimit);
|
|
|
ffb978 |
+
|
|
|
ffb978 |
+ state_qfilestat(fp, mount, type, qsv, accounting, enforcing);
|
|
|
ffb978 |
+
|
|
|
ffb978 |
+ state_timelimit(fp, XFS_BLOCK_QUOTA, sv->qs_btimelimit);
|
|
|
ffb978 |
+ state_warnlimit(fp, XFS_BLOCK_QUOTA, sv->qs_bwarnlimit);
|
|
|
ffb978 |
+
|
|
|
ffb978 |
+ state_timelimit(fp, XFS_INODE_QUOTA, sv->qs_itimelimit);
|
|
|
ffb978 |
+ state_warnlimit(fp, XFS_INODE_QUOTA, sv->qs_iwarnlimit);
|
|
|
ffb978 |
+
|
|
|
ffb978 |
+ state_timelimit(fp, XFS_RTBLOCK_QUOTA, sv->qs_rtbtimelimit);
|
|
|
ffb978 |
+}
|
|
|
ffb978 |
+
|
|
|
ffb978 |
+static void
|
|
|
ffb978 |
+state_quotafile_mount(
|
|
|
ffb978 |
+ FILE *fp,
|
|
|
ffb978 |
+ uint type,
|
|
|
ffb978 |
+ struct fs_path *mount,
|
|
|
ffb978 |
+ uint flags)
|
|
|
ffb978 |
+{
|
|
|
ffb978 |
+ struct fs_quota_stat s;
|
|
|
ffb978 |
+ struct fs_quota_statv sv;
|
|
|
ffb978 |
+
|
|
|
ffb978 |
+ sv.qs_version = FS_QSTATV_VERSION1;
|
|
|
ffb978 |
+
|
|
|
ffb978 |
+ if (type & XFS_USER_QUOTA) {
|
|
|
ffb978 |
+ state_quotafile_stat(fp, XFS_USER_QUOTA, mount,
|
|
|
ffb978 |
+ &sv, &s, flags);
|
|
|
ffb978 |
+ }
|
|
|
ffb978 |
+
|
|
|
ffb978 |
+ if (type & XFS_GROUP_QUOTA) {
|
|
|
ffb978 |
+ state_quotafile_stat(fp, XFS_GROUP_QUOTA, mount,
|
|
|
ffb978 |
+ &sv, &s, flags);
|
|
|
ffb978 |
+ }
|
|
|
ffb978 |
+
|
|
|
ffb978 |
+ if (type & XFS_PROJ_QUOTA) {
|
|
|
ffb978 |
+ state_quotafile_stat(fp, XFS_PROJ_QUOTA, mount,
|
|
|
ffb978 |
+ &sv, &s, flags);
|
|
|
ffb978 |
+ }
|
|
|
ffb978 |
}
|
|
|
ffb978 |
|
|
|
ffb978 |
static void
|
|
|
ffb978 |
--
|
|
|
ffb978 |
2.31.1
|
|
|
ffb978 |
|