From: "Darrick J. Wong" <darrick.wong@oracle.com>
To: "Bill O'Donnell" <billodo@redhat.com>
Cc: linux-xfs@vger.kernel.org, sandeen@sandeen.net
Subject: Re: [PATCH v2 3/3] xfsprogs: xfs_quota state command should report ugp grace times
Date: Fri, 17 Jul 2020 14:13:45 -0700 [thread overview]
Message-ID: <20200717211345.GS3151642@magnolia> (raw)
In-Reply-To: <20200717204314.309873-1-billodo@redhat.com>
On Fri, Jul 17, 2020 at 03:43:14PM -0500, Bill O'Donnell wrote:
> Since grace periods are now supported for three quota types (ugp),
> modify xfs_quota state command to report times for all three.
> Add a helper function for stat reporting.
>
> Signed-off-by: Bill O'Donnell <billodo@redhat.com>
> ---
> v2: load-up helper function more, further reducing redundant LoC
>
> quota/state.c | 96 +++++++++++++++++++++++++++++++++++----------------
> 1 file changed, 67 insertions(+), 29 deletions(-)
>
> diff --git a/quota/state.c b/quota/state.c
> index 1627181d..19d34ed0 100644
> --- a/quota/state.c
> +++ b/quota/state.c
> @@ -191,49 +191,87 @@ state_stat_to_statv(
> }
>
> static void
> -state_quotafile_mount(
> +state_quotafile_stat(
> FILE *fp,
> uint type,
> - struct fs_path *mount,
> + struct fs_path *mount,
> + struct fs_quota_statv *sv,
> + struct fs_quota_stat *s,
> uint flags)
> {
> - struct fs_quota_stat s;
> - struct fs_quota_statv sv;
> + bool accounting, enforcing;
> + struct fs_qfilestatv *qsv;
> char *dev = mount->fs_name;
>
> - sv.qs_version = FS_QSTATV_VERSION1;
> -
> - if (xfsquotactl(XFS_GETQSTATV, dev, type, 0, (void *)&sv) < 0) {
> - if (xfsquotactl(XFS_GETQSTAT, dev, type, 0, (void *)&s) < 0) {
> + if (xfsquotactl(XFS_GETQSTATV, dev, type, 0, (void *)sv) < 0) {
At some point I'd love to refactor all these ioctl-like xfsquotactl
calls into a set of real functions with type checking and whatnot, but
this looks fine to me on its own:
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
--D
> + if (xfsquotactl(XFS_GETQSTAT, dev, type, 0, (void *)s) < 0) {
> if (flags & VERBOSE_FLAG)
> fprintf(fp,
> _("%s quota are not enabled on %s\n"),
> type_to_string(type), dev);
> return;
> }
> - state_stat_to_statv(&s, &sv);
> + state_stat_to_statv(s, sv);
> + }
> +
> + switch(type) {
> + case XFS_USER_QUOTA:
> + qsv = &sv->qs_uquota;
> + accounting = sv->qs_flags & XFS_QUOTA_UDQ_ACCT;
> + enforcing = sv->qs_flags & XFS_QUOTA_UDQ_ENFD;
> + break;
> + case XFS_GROUP_QUOTA:
> + qsv = &sv->qs_gquota;
> + accounting = sv->qs_flags & XFS_QUOTA_GDQ_ACCT;
> + enforcing = sv->qs_flags & XFS_QUOTA_GDQ_ENFD;
> + break;
> + case XFS_PROJ_QUOTA:
> + qsv = &sv->qs_pquota;
> + accounting = sv->qs_flags & XFS_QUOTA_PDQ_ACCT;
> + enforcing = sv->qs_flags & XFS_QUOTA_PDQ_ENFD;
> + break;
> + default:
> + return;
> }
>
> - if (type & XFS_USER_QUOTA)
> - state_qfilestat(fp, mount, XFS_USER_QUOTA, &sv.qs_uquota,
> - sv.qs_flags & XFS_QUOTA_UDQ_ACCT,
> - sv.qs_flags & XFS_QUOTA_UDQ_ENFD);
> - if (type & XFS_GROUP_QUOTA)
> - state_qfilestat(fp, mount, XFS_GROUP_QUOTA, &sv.qs_gquota,
> - sv.qs_flags & XFS_QUOTA_GDQ_ACCT,
> - sv.qs_flags & XFS_QUOTA_GDQ_ENFD);
> - if (type & XFS_PROJ_QUOTA)
> - state_qfilestat(fp, mount, XFS_PROJ_QUOTA, &sv.qs_pquota,
> - sv.qs_flags & XFS_QUOTA_PDQ_ACCT,
> - sv.qs_flags & XFS_QUOTA_PDQ_ENFD);
> -
> - state_timelimit(fp, XFS_BLOCK_QUOTA, sv.qs_btimelimit);
> - state_warnlimit(fp, XFS_BLOCK_QUOTA, sv.qs_bwarnlimit);
> -
> - state_timelimit(fp, XFS_INODE_QUOTA, sv.qs_itimelimit);
> - state_warnlimit(fp, XFS_INODE_QUOTA, sv.qs_iwarnlimit);
> -
> - state_timelimit(fp, XFS_RTBLOCK_QUOTA, sv.qs_rtbtimelimit);
> +
> + state_qfilestat(fp, mount, type, qsv, accounting, enforcing);
> +
> + state_timelimit(fp, XFS_BLOCK_QUOTA, sv->qs_btimelimit);
> + state_warnlimit(fp, XFS_BLOCK_QUOTA, sv->qs_bwarnlimit);
> +
> + state_timelimit(fp, XFS_INODE_QUOTA, sv->qs_itimelimit);
> + state_warnlimit(fp, XFS_INODE_QUOTA, sv->qs_iwarnlimit);
> +
> + state_timelimit(fp, XFS_RTBLOCK_QUOTA, sv->qs_rtbtimelimit);
> +}
> +
> +static void
> +state_quotafile_mount(
> + FILE *fp,
> + uint type,
> + struct fs_path *mount,
> + uint flags)
> +{
> + struct fs_quota_stat s;
> + struct fs_quota_statv sv;
> +
> + sv.qs_version = FS_QSTATV_VERSION1;
> +
> + if (type & XFS_USER_QUOTA) {
> + state_quotafile_stat(fp, XFS_USER_QUOTA, mount,
> + &sv, &s, flags);
> + }
> +
> + if (type & XFS_GROUP_QUOTA) {
> + state_quotafile_stat(fp, XFS_GROUP_QUOTA, mount,
> + &sv, &s, flags);
> + }
> +
> + if (type & XFS_PROJ_QUOTA) {
> + state_quotafile_stat(fp, XFS_PROJ_QUOTA, mount,
> + &sv, &s, flags);
> + }
> }
>
> static void
> --
> 2.26.2
>
next prev parent reply other threads:[~2020-07-17 21:13 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-15 20:12 [PATCH 0/3] xfsprogs: xfs_quota error message and state reporting improvement Bill O'Donnell
2020-07-15 20:12 ` [PATCH 1/3] xfsprogs: xfs_quota command error message improvement Bill O'Donnell
2020-07-17 21:10 ` Darrick J. Wong
2020-07-21 15:04 ` Christoph Hellwig
2020-07-21 15:55 ` Bill O'Donnell
2020-07-15 20:12 ` [PATCH 2/3] xfs_quota: display warning limits when printing quota type information Bill O'Donnell
2020-07-15 20:12 ` [PATCH 3/3] xfsprogs: xfs_quota state command should report ugp grace times Bill O'Donnell
2020-07-15 20:33 ` Eric Sandeen
2020-07-15 20:44 ` Bill O'Donnell
2020-07-17 20:43 ` [PATCH v2 " Bill O'Donnell
2020-07-17 21:13 ` Darrick J. Wong [this message]
2020-07-21 15:05 ` Christoph Hellwig
2020-07-30 17:46 ` [PATCH 0/3] xfsprogs: xfs_quota error message and state reporting improvement Eric Sandeen
2020-07-30 17:52 ` Bill O'Donnell
2020-07-30 18:30 ` Eric Sandeen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200717211345.GS3151642@magnolia \
--to=darrick.wong@oracle.com \
--cc=billodo@redhat.com \
--cc=linux-xfs@vger.kernel.org \
--cc=sandeen@sandeen.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).