* [PATCH 1/3] xfs_quota: define Q_XGETQUOTA2
2016-01-08 18:56 [PATCH 0/3] xfsprogs: use Q_XGETQUOTA2 Eric Sandeen
@ 2016-01-08 18:57 ` Eric Sandeen
2016-01-08 18:57 ` [PATCH 2/3] xfs_quota: make report_mount() take an "output id" Eric Sandeen
2016-01-08 18:57 ` [PATCH 3/3] xfs_quota: use Q_XGETQUOTA2 for repquota Eric Sandeen
2 siblings, 0 replies; 4+ messages in thread
From: Eric Sandeen @ 2016-01-08 18:57 UTC (permalink / raw)
To: xfs
This simply defines the Q_XGETQUOTA2 quotactl in xfsprogs.
Signed-off-by: Eric Sandeen <sandeen@redhat.com>
---
include/xqm.h | 1 +
quota/linux.c | 2 ++
quota/quota.h | 2 ++
3 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/include/xqm.h b/include/xqm.h
index 47f58a0..2cf4311 100644
--- a/include/xqm.h
+++ b/include/xqm.h
@@ -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_XGETQUOTA2 XQM_CMD(9) /* get disk limits and usage */
/*
* fs_disk_quota structure:
diff --git a/quota/linux.c b/quota/linux.c
index 8a73922..84ac674 100644
--- a/quota/linux.c
+++ b/quota/linux.c
@@ -49,6 +49,8 @@ xcommand_to_qcommand(
return Q_XQUOTAOFF;
case XFS_GETQUOTA:
return Q_XGETQUOTA;
+ case XFS_GETQUOTA2:
+ return Q_XGETQUOTA2;
case XFS_SETQLIM:
return Q_XSETQLIM;
case XFS_GETQSTAT:
diff --git a/quota/quota.h b/quota/quota.h
index 416f335..8b80029 100644
--- a/quota/quota.h
+++ b/quota/quota.h
@@ -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_GETQUOTA2, /* get disk limits and usage */
};
/*
--
1.7.1
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH 2/3] xfs_quota: make report_mount() take an "output id"
2016-01-08 18:56 [PATCH 0/3] xfsprogs: use Q_XGETQUOTA2 Eric Sandeen
2016-01-08 18:57 ` [PATCH 1/3] xfs_quota: define Q_XGETQUOTA2 Eric Sandeen
@ 2016-01-08 18:57 ` Eric Sandeen
2016-01-08 18:57 ` [PATCH 3/3] xfs_quota: use Q_XGETQUOTA2 for repquota Eric Sandeen
2 siblings, 0 replies; 4+ messages in thread
From: Eric Sandeen @ 2016-01-08 18:57 UTC (permalink / raw)
To: xfs
Allow report_mount() to take a *oid pointer, an "output id"
which will be filled in if the quotactl returns an ID for
something other than that which was passed in.
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_XGETQUOTA2 will make use of this.
Signed-off-by: Eric Sandeen <sandeen@redhat.com>
---
quota/report.c | 24 ++++++++++++++----------
1 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/quota/report.c b/quota/report.c
index c77b24f..746b04a 100644
--- a/quota/report.c
+++ b/quota/report.c
@@ -291,6 +291,7 @@ report_mount(
FILE *fp,
__uint32_t id,
char *name,
+ __uint32_t *oid,
uint form,
uint type,
fs_path_t *mount,
@@ -308,6 +309,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 +328,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 +429,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 +461,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 +492,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;
}
--
1.7.1
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH 3/3] xfs_quota: use Q_XGETQUOTA2 for repquota
2016-01-08 18:56 [PATCH 0/3] xfsprogs: use Q_XGETQUOTA2 Eric Sandeen
2016-01-08 18:57 ` [PATCH 1/3] xfs_quota: define Q_XGETQUOTA2 Eric Sandeen
2016-01-08 18:57 ` [PATCH 2/3] xfs_quota: make report_mount() take an "output id" Eric Sandeen
@ 2016-01-08 18:57 ` Eric Sandeen
2 siblings, 0 replies; 4+ messages in thread
From: Eric Sandeen @ 2016-01-08 18:57 UTC (permalink / raw)
To: xfs
Rather than a loop over getpwnam() etc, use the Q_XGETQUOTA2
command to iterate through all active quotas.
If Q_XGETQUOTA2 fails, go back to the old way.
Signed-off-by: Eric Sandeen <sandeen@redhat.com>
---
quota/quota.h | 1 +
quota/report.c | 41 +++++++++++++++++++++++++++++++++++++----
2 files changed, 38 insertions(+), 4 deletions(-)
diff --git a/quota/quota.h b/quota/quota.h
index 8b80029..dec8330 100644
--- a/quota/quota.h
+++ b/quota/quota.h
@@ -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 */
+ GETQUOTA2_FLAG = 0x0800, /* use getquota2 quotactl */
};
/*
diff --git a/quota/report.c b/quota/report.c
index 746b04a..093155b 100644
--- a/quota/report.c
+++ b/quota/report.c
@@ -302,8 +302,14 @@ report_mount(
char c[8], h[8], s[8];
uint qflags;
int count;
+ int cmd;
- if (xfsquotactl(XFS_GETQUOTA, dev, type, id, (void *)&d) < 0) {
+ if (flags & GETQUOTA2_FLAG)
+ cmd = XFS_GETQUOTA2;
+ else
+ cmd = XFS_GETQUOTA;
+
+ if (xfsquotactl(cmd, dev, type, id, (void *)&d) < 0) {
if (errno != ENOENT && errno != ENOSYS && errno != ESRCH)
perror("XFS_GETQUOTA");
return 0;
@@ -425,7 +431,7 @@ report_user_mount(
uint flags)
{
struct passwd *u;
- uint id;
+ uint id = 0, oid;
if (upper) { /* identifier range specified */
for (id = lower; id <= upper; id++) {
@@ -433,6 +439,15 @@ report_user_mount(
form, XFS_USER_QUOTA, mount, flags))
flags |= NO_HEADER_FLAG;
}
+ } else if (report_mount(fp, id, NULL, &oid, form,
+ XFS_USER_QUOTA, mount, flags|GETQUOTA2_FLAG)) {
+ id = oid + 1;
+ flags |= GETQUOTA2_FLAG;
+ flags |= NO_HEADER_FLAG;
+ while (report_mount(fp, id, NULL, &oid, form, XFS_USER_QUOTA,
+ mount, flags)) {
+ id = oid + 1;
+ }
} else {
setpwent();
while ((u = getpwent()) != NULL) {
@@ -457,7 +472,7 @@ report_group_mount(
uint flags)
{
struct group *g;
- uint id;
+ uint id = 0, oid;
if (upper) { /* identifier range specified */
for (id = lower; id <= upper; id++) {
@@ -465,6 +480,15 @@ report_group_mount(
form, XFS_GROUP_QUOTA, mount, flags))
flags |= NO_HEADER_FLAG;
}
+ } else if (report_mount(fp, id, NULL, &oid, form,
+ XFS_GROUP_QUOTA, mount, flags|GETQUOTA2_FLAG)) {
+ id = oid + 1;
+ flags |= GETQUOTA2_FLAG;
+ flags |= NO_HEADER_FLAG;
+ while (report_mount(fp, id, NULL, &oid, form, XFS_GROUP_QUOTA,
+ mount, flags)) {
+ id = oid + 1;
+ }
} else {
setgrent();
while ((g = getgrent()) != NULL) {
@@ -488,7 +512,7 @@ report_project_mount(
uint flags)
{
fs_project_t *p;
- uint id;
+ uint id = 0, oid;
if (upper) { /* identifier range specified */
for (id = lower; id <= upper; id++) {
@@ -496,6 +520,15 @@ report_project_mount(
form, XFS_PROJ_QUOTA, mount, flags))
flags |= NO_HEADER_FLAG;
}
+ } else if (report_mount(fp, id, NULL, &oid, form,
+ XFS_PROJ_QUOTA, mount, flags|GETQUOTA2_FLAG)) {
+ id = oid + 1;
+ flags |= GETQUOTA2_FLAG;
+ flags |= NO_HEADER_FLAG;
+ while (report_mount(fp, id, NULL, &oid, form, XFS_PROJ_QUOTA,
+ mount, flags)) {
+ id = oid + 1;
+ }
} else {
setprent();
while ((p = getprent()) != NULL) {
--
1.7.1
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
^ permalink raw reply related [flat|nested] 4+ messages in thread