diff mbox series

xfsprogs: xfs_quota state command should report ugp grace times

Message ID 20200709212657.216923-1-billodo@redhat.com (mailing list archive)
State Superseded, archived
Headers show
Series xfsprogs: xfs_quota state command should report ugp grace times | expand

Commit Message

Bill O'Donnell July 9, 2020, 9:26 p.m. UTC 
Since grace periods are now supported for three quota types (ugp),
modify xfs_quota state command to report times for all three.

Signed-off-by: Bill O'Donnell <billodo@redhat.com>
---
 quota/state.c | 71 ++++++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 56 insertions(+), 15 deletions(-)

Comments

Christoph Hellwig July 10, 2020, 9 a.m. UTC | #1 
On Thu, Jul 09, 2020 at 04:26:57PM -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.

This looks like it'll clash with the patch that Darrick just sent..

> +	if (type & XFS_USER_QUOTA) {
> +		if (xfsquotactl(XFS_GETQSTATV, dev, XFS_USER_QUOTA,
> +				0, (void *)&sv) < 0) {
> +			if (xfsquotactl(XFS_GETQSTAT, dev, XFS_USER_QUOTA,
> +					0, (void *)&s) < 0) {
> +				if (flags & VERBOSE_FLAG)
> +					fprintf(fp,
> +						_("%s quota are not enabled on %s\n"),
> +						type_to_string(XFS_USER_QUOTA),
> +						dev);
> +				return;
> +			}
> +			state_stat_to_statv(&s, &sv);
>  		}
>  
>  		state_qfilestat(fp, mount, XFS_USER_QUOTA, &sv.qs_uquota,
>  				sv.qs_flags & XFS_QUOTA_UDQ_ACCT,
>  				sv.qs_flags & XFS_QUOTA_UDQ_ENFD);
> +		state_timelimit(fp, XFS_BLOCK_QUOTA, sv.qs_btimelimit);
> +		state_timelimit(fp, XFS_INODE_QUOTA, sv.qs_itimelimit);
> +		state_timelimit(fp, XFS_RTBLOCK_QUOTA, sv.qs_rtbtimelimit);
> +	}

Any chance we could factor this repititive code into a helper?
Bill O'Donnell July 10, 2020, 1:53 p.m. UTC | #2 
On Fri, Jul 10, 2020 at 10:00:42AM +0100, Christoph Hellwig wrote:
> On Thu, Jul 09, 2020 at 04:26:57PM -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.
> 
> This looks like it'll clash with the patch that Darrick just sent..
> 
> > +	if (type & XFS_USER_QUOTA) {
> > +		if (xfsquotactl(XFS_GETQSTATV, dev, XFS_USER_QUOTA,
> > +				0, (void *)&sv) < 0) {
> > +			if (xfsquotactl(XFS_GETQSTAT, dev, XFS_USER_QUOTA,
> > +					0, (void *)&s) < 0) {
> > +				if (flags & VERBOSE_FLAG)
> > +					fprintf(fp,
> > +						_("%s quota are not enabled on %s\n"),
> > +						type_to_string(XFS_USER_QUOTA),
> > +						dev);
> > +				return;
> > +			}
> > +			state_stat_to_statv(&s, &sv);
> >  		}
> >  
> >  		state_qfilestat(fp, mount, XFS_USER_QUOTA, &sv.qs_uquota,
> >  				sv.qs_flags & XFS_QUOTA_UDQ_ACCT,
> >  				sv.qs_flags & XFS_QUOTA_UDQ_ENFD);
> > +		state_timelimit(fp, XFS_BLOCK_QUOTA, sv.qs_btimelimit);
> > +		state_timelimit(fp, XFS_INODE_QUOTA, sv.qs_itimelimit);
> > +		state_timelimit(fp, XFS_RTBLOCK_QUOTA, sv.qs_rtbtimelimit);
> > +	}
> 
> Any chance we could factor this repititive code into a helper?
> 
Yeah, that makes sense. I'll do it.
Thanks-
Bill
diff mbox series

Patch

diff --git a/quota/state.c b/quota/state.c
index 7a595fc6..32ccfa42 100644
--- a/quota/state.c
+++ b/quota/state.c
@@ -193,33 +193,74 @@  state_quotafile_mount(
 
 	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 (flags & VERBOSE_FLAG)
-				fprintf(fp,
-					_("%s quota are not enabled on %s\n"),
-					type_to_string(type), dev);
-			return;
+	if (type & XFS_USER_QUOTA) {
+		if (xfsquotactl(XFS_GETQSTATV, dev, XFS_USER_QUOTA,
+				0, (void *)&sv) < 0) {
+			if (xfsquotactl(XFS_GETQSTAT, dev, XFS_USER_QUOTA,
+					0, (void *)&s) < 0) {
+				if (flags & VERBOSE_FLAG)
+					fprintf(fp,
+						_("%s quota are not enabled on %s\n"),
+						type_to_string(XFS_USER_QUOTA),
+						dev);
+				return;
+			}
+			state_stat_to_statv(&s, &sv);
 		}
-		state_stat_to_statv(&s, &sv);
-	}
 
-	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_timelimit(fp, XFS_BLOCK_QUOTA, sv.qs_btimelimit);
+		state_timelimit(fp, XFS_INODE_QUOTA, sv.qs_itimelimit);
+		state_timelimit(fp, XFS_RTBLOCK_QUOTA, sv.qs_rtbtimelimit);
+	}
+
+	if (type & XFS_GROUP_QUOTA) {
+		if (xfsquotactl(XFS_GETQSTATV, dev, XFS_GROUP_QUOTA,
+				0, (void *)&sv) < 0) {
+			if (xfsquotactl(XFS_GETQSTAT, dev, XFS_GROUP_QUOTA,
+					0, (void *)&s) < 0) {
+				if (flags & VERBOSE_FLAG)
+					fprintf(fp,
+						_("%s quota are not enabled on %s\n"),
+						type_to_string(XFS_GROUP_QUOTA),
+						dev);
+				return;
+			}
+			state_stat_to_statv(&s, &sv);
+		}
 		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_timelimit(fp, XFS_BLOCK_QUOTA, sv.qs_btimelimit);
+		state_timelimit(fp, XFS_INODE_QUOTA, sv.qs_itimelimit);
+		state_timelimit(fp, XFS_RTBLOCK_QUOTA, sv.qs_rtbtimelimit);
+	}
+
+	if (type & XFS_PROJ_QUOTA) {
+		if (xfsquotactl(XFS_GETQSTATV, dev, XFS_PROJ_QUOTA,
+				0, (void *)&sv) < 0) {
+			if (xfsquotactl(XFS_GETQSTAT, dev, XFS_PROJ_QUOTA,
+					0, (void *)&s) < 0) {
+				if (flags & VERBOSE_FLAG)
+					fprintf(fp,
+						_("%s quota are not enabled on %s\n"),
+						type_to_string(XFS_PROJ_QUOTA),
+						dev);
+				return;
+			}
+			state_stat_to_statv(&s, &sv);
+		}
 		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_timelimit(fp, XFS_INODE_QUOTA, sv.qs_itimelimit);
-	state_timelimit(fp, XFS_RTBLOCK_QUOTA, sv.qs_rtbtimelimit);
+		state_timelimit(fp, XFS_BLOCK_QUOTA, sv.qs_btimelimit);
+		state_timelimit(fp, XFS_INODE_QUOTA, sv.qs_itimelimit);
+		state_timelimit(fp, XFS_RTBLOCK_QUOTA, sv.qs_rtbtimelimit);
+	}
 }
 
 static void