xfsprogs: use Q_XGETNEXTQUOTA
cover xfsprogs: use Q_XGETNEXTQUOTA
Patch series to make xfs_quota's repquota and quota dump use the new Q_XGETNEXTQUOTA interface.
-Eric
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
PATCH 1/3 xfs_quota: define Q_XGETNEXTQUOTA
This simply defines the Q_XGETNEXTQUOTA quotactl in xfsprogs.
--- include/xqm.h | 1 + quota/linux.c | 2 ++ quota/quota.h | 2 ++ 3 files changed, 5 insertions(+), 0 deletions(-)
include/xqm.h +1 -0
@@ -32,6 +32,7 @@#define Q_XGETQSTAT XQM_CMD(5)/* get quota subsystem status */ #define Q_XQUOTARM XQM_CMD(6)/* free disk space used by dquots */ #define Q_XQUOTASYNC XQM_CMD(7)/* delalloc flush, updates dquots */ +#define Q_XGETNEXTQUOTA XQM_CMD(9)/* get disk limits and usage */ /* * fs_disk_quota structure:
quota/linux.c +2 -0
@@ -49,6 +49,8 @@ xcommand_to_qcommand(return Q_XQUOTAOFF ;case XFS_GETQUOTA :return Q_XGETQUOTA ; +case XFS_GETNEXTQUOTA : +return Q_XGETNEXTQUOTA ;case XFS_SETQLIM :return Q_XSETQLIM ;case XFS_GETQSTAT :
quota/quota.h +2 -0
@@ -43,6 +43,8 @@ enum {XFS_GETQSTAT ,/* get quota subsystem status */ XFS_QUOTARM ,/* free disk space used by dquots */ XFS_QSYNC ,/* flush delayed allocate space */ +XFS_GETQSTATV ,/* newer version of quota stats */ + XFS_GETNEXTQUOTA, /* get disk limits and usage */ };/*
Signature · 6 lines
1.7.1 _______________________________________________ xfs mailing list [email protected] http://oss.sgi.com/mailman/listinfo/xfs
PATCH 2/3 xfs_quota: make report_mount() & dump_file() take an "output id"
In reply to Eric SandeenAllow report_mount() and dump_file() to take a *oid pointer, an "output id" which will be filled in from the returned quota information. Useful if the quotactl returns an ID for something other than that which was passed in, i.e. GETNEXTQUOTA.
Also, when printing results, print the id which was actually returned, not the id which was passed in.
Should be a no-op change at this point; the next patch which wires in Q_XGETNEXTQUOTA will make use of this.
--- quota/report.c | 46 ++++++++++++++++++++++++++++++---------------- 1 files changed, 30 insertions(+), 16 deletions(-)
quota/report.c +30 -16
@@ -77,6 +77,7 @@ static voiddump_file (FILE *fp, uint id, + uint *oid, uint type, char *dev) {
@@ -87,6 +88,10 @@ dump_file(perror ("XFS_GETQUOTA" );return ; } + +if (oid) + *oid = d.d_id; +if (!d.d_blk_softlimit && !d.d_blk_hardlimit && !d.d_ino_softlimit && !d.d_ino_hardlimit && !d.d_rtb_softlimit && !d.d_rtb_hardlimit)
@@ -94,7 +99,8 @@ dump_file(fprintf (fp,"fs = %s\n" , dev);/* this branch is for backward compatibility reasons */ if (d.d_rtb_softlimit || d.d_rtb_hardlimit) - fprintf(fp, "%-10d %7llu %7llu %7llu %7llu %7llu %7llu\n", id, + fprintf(fp, "%-10d %7llu %7llu %7llu %7llu %7llu %7llu\n", + d.d_id, (unsigned long long)d.d_blk_softlimit, (unsigned long long)d.d_blk_hardlimit, (unsigned long long)d.d_ino_softlimit,
@@ -102,7 +108,8 @@ dump_file( (unsigned long long )d.d_rtb_softlimit, (unsigned long long)d.d_rtb_hardlimit); else - fprintf(fp, "%-10d %7llu %7llu %7llu %7llu\n", id, + fprintf(fp, "%-10d %7llu %7llu %7llu %7llu\n", + d.d_id, (unsigned long long )d.d_blk_softlimit, (unsigned long long )d.d_blk_hardlimit, (unsigned long long)d.d_ino_softlimit,
@@ -129,7 +136,7 @@ dump_limits_any_type(if (upper) {for (id = lower; id <= upper; id++) -dump_file (fp, id, type, mount->fs_name); +dump_file (fp, id,NULL , type, mount->fs_name);return ; }
@@ -138,7 +145,8 @@ dump_limits_any_type(struct group *g;setgrent ();while ((g =getgrent ()) !=NULL ) -dump_file (fp, g->gr_gid, type, mount->fs_name); +dump_file (fp, g->gr_gid,NULL , type, + mount->fs_name);endgrent ();break ; }
@@ -146,7 +154,8 @@ dump_limits_any_type(struct fs_project *p;setprent ();while ((p =getprent ()) !=NULL ) -dump_file (fp, p->pr_prid, type, mount->fs_name); +dump_file (fp, p->pr_prid,NULL , type, + mount->fs_name);endprent ();break ; }
@@ -154,7 +163,8 @@ dump_limits_any_type(struct passwd *u;setpwent ();while ((u =getpwent ()) !=NULL ) -dump_file (fp, u->pw_uid, type, mount->fs_name); +dump_file (fp, u->pw_uid,NULL , type, + mount->fs_name);endpwent ();break ; }
@@ -291,6 +301,7 @@ report_mount(FILE *fp, __uint32_t id, char *name, + __uint32_t *oid, uint form, uint type, fs_path_t *mount,
@@ -308,6 +319,9 @@ report_mount(return 0 ; } +if (oid) + *oid = d.d_id; +if (flags &TERSE_FLAG ) { count =0 ;if ((form &XFS_BLOCK_QUOTA ) && d.d_bcount)
@@ -324,19 +338,19 @@ report_mount(report_header (fp, form, type, mount, flags);if (flags &NO_LOOKUP_FLAG ) { -fprintf (fp,"#%-10u" , id); +fprintf (fp,"#%-10u" , d.d_id); }else {if (name ==NULL ) {if (type ==XFS_USER_QUOTA ) { -struct passwd *u =getpwuid (id); +struct passwd *u =getpwuid (d.d_id);if (u) name = u->pw_name; }else if (type ==XFS_GROUP_QUOTA ) { -struct group *g =getgrgid (id); +struct group *g =getgrgid (d.d_id);if (g) name = g->gr_name; }else if (type ==XFS_PROJ_QUOTA ) { -fs_project_t *p =getprprid (id); +fs_project_t *p =getprprid (d.d_id);if (p) name = p->pr_name; }
@@ -425,14 +439,14 @@ report_user_mount(if (upper) {/* identifier range specified */ for (id = lower; id <= upper; id++) { -if (report_mount (fp, id,NULL , +if (report_mount (fp, id,NULL ,NULL , form,XFS_USER_QUOTA , mount, flags)) flags |=NO_HEADER_FLAG ; } }else {setpwent ();while ((u =getpwent ()) !=NULL ) { -if (report_mount (fp, u->pw_uid, u->pw_name, +if (report_mount (fp, u->pw_uid, u->pw_name,NULL , form,XFS_USER_QUOTA , mount, flags)) flags |=NO_HEADER_FLAG ; }
@@ -457,14 +471,14 @@ report_group_mount(if (upper) {/* identifier range specified */ for (id = lower; id <= upper; id++) { -if (report_mount (fp, id,NULL , +if (report_mount (fp, id,NULL ,NULL , form,XFS_GROUP_QUOTA , mount, flags)) flags |=NO_HEADER_FLAG ; } }else {setgrent ();while ((g =getgrent ()) !=NULL ) { -if (report_mount (fp, g->gr_gid, g->gr_name, +if (report_mount (fp, g->gr_gid, g->gr_name,NULL , form,XFS_GROUP_QUOTA , mount, flags)) flags |=NO_HEADER_FLAG ; }
@@ -488,14 +502,14 @@ report_project_mount(if (upper) {/* identifier range specified */ for (id = lower; id <= upper; id++) { -if (report_mount (fp, id,NULL , +if (report_mount (fp, id,NULL ,NULL , form,XFS_PROJ_QUOTA , mount, flags)) flags |=NO_HEADER_FLAG ; } }else {setprent ();while ((p =getprent ()) !=NULL ) { -if (report_mount (fp, p->pr_prid, p->pr_name, +if (report_mount (fp, p->pr_prid, p->pr_name,NULL , form,XFS_PROJ_QUOTA , mount, flags)) flags |=NO_HEADER_FLAG ; }
Signature · 6 lines
1.7.1 _______________________________________________ xfs mailing list [email protected] http://oss.sgi.com/mailman/listinfo/xfs
PATCH 3/3 xfs_quota: use Q_XGETNEXTQUOTA for report and dump
In reply to Eric SandeenRather than a loop over getpwnam() etc, use the Q_XGETNEXTQUOTA command to iterate through all active quotas in quota reports and quota file dump.
If Q_XGETNEXTQUOTA fails, go back to the old way.
---
(This stuff is screaming to be refactored and made consistent, but my first attempt left me screaming too, so I'll leave it for another day.)
quota/quota.h | 1 + quota/report.c | 84 ++++++++++++++++++++++++++++++++++++++++++++++--------- 2 files changed, 71 insertions(+), 14 deletions(-)
quota/quota.h +1 -0
@@ -74,6 +74,7 @@ enum {DEFAULTS_FLAG =0x0100 ,/* use value as a default */ ABSOLUTE_FLAG =0x0200 ,/* absolute time, not related to now */ NO_LOOKUP_FLAG =0x0400 ,/* skip name lookups, just report ID */ + GETNEXTQUOTA_FLAG = 0x0800, /* use getnextquota quotactl */ };/*
quota/report.c +70 -14
190 lines not on this page · raw message
Signature · 6 lines
1.7.1 _______________________________________________ xfs mailing list [email protected] http://oss.sgi.com/mailman/listinfo/xfs