774297
From 7367f5d511ec4555fbb7a87c1c1853fd4fd01712 Mon Sep 17 00:00:00 2001
774297
From: Jan Kara <jack@suse.cz>
774297
Date: Tue, 26 Jan 2016 14:06:59 +0100
774297
Subject: [PATCH 2/2] Add support for scanning using Q_XGETNEXTQUOTA
774297
MIME-Version: 1.0
774297
Content-Type: text/plain; charset=UTF-8
774297
Content-Transfer-Encoding: 8bit
774297
774297
Add support for scanning of all available quota structures using
774297
Q_XGETNEXTQUOTA quotactl.
774297
774297
Signed-off-by: Jan Kara <jack@suse.cz>
774297
Signed-off-by: Petr Písař <ppisar@redhat.com>
774297
---
774297
 quotaio_xfs.c | 42 +++++++++++++++++++++++++++++++++++++++---
774297
 quotaio_xfs.h |  1 +
774297
 2 files changed, 40 insertions(+), 3 deletions(-)
774297
774297
diff --git a/quotaio_xfs.c b/quotaio_xfs.c
774297
index 903c03e..9d90a3e 100644
774297
--- a/quotaio_xfs.c
774297
+++ b/quotaio_xfs.c
774297
@@ -191,15 +191,51 @@ static int xfs_get_dquot(struct dquot *dq)
774297
 	return 0;
774297
 }
774297
 
774297
+static int xfs_kernel_scan_dquots(struct quota_handle *h,
774297
+		int (*process_dquot)(struct dquot *dquot, char *dqname))
774297
+{
774297
+	struct dquot *dquot = get_empty_dquot();
774297
+	qid_t id = 0;
774297
+	struct xfs_kern_dqblk xdqblk;
774297
+	int ret;
774297
+
774297
+	dquot->dq_h = h;
774297
+	while (1) {
774297
+		ret = quotactl(QCMD(Q_XGETNEXTQUOTA, h->qh_type),
774297
+			       h->qh_quotadev, id, (void *)&xdqblk);
774297
+		if (ret < 0)
774297
+			break;
774297
+
774297
+		xfs_kern2utildqblk(&dquot->dq_dqb, &xdqblk);
774297
+		dquot->dq_id = xdqblk.d_id;
774297
+		ret = process_dquot(dquot, NULL);
774297
+		if (ret < 0)
774297
+			break;
774297
+		id = xdqblk.d_id + 1;
774297
+	}
774297
+	free(dquot);
774297
+
774297
+	if (errno == ENOENT)
774297
+		return 0;
774297
+	return ret;
774297
+}
774297
+
774297
 /*
774297
  *	Scan all known dquots and call callback on each
774297
  */
774297
 static int xfs_scan_dquots(struct quota_handle *h, int (*process_dquot) (struct dquot *dquot, char *dqname))
774297
 {
774297
-	if (!XFS_USRQUOTA(h) && !XFS_GRPQUOTA(h))
774297
-		return 0;
774297
+	int ret;
774297
+	struct xfs_kern_dqblk xdqblk;
774297
 
774297
-	return generic_scan_dquots(h, process_dquot, xfs_get_dquot);
774297
+	ret = quotactl(QCMD(Q_XGETNEXTQUOTA, h->qh_type), h->qh_quotadev, 0,
774297
+		       (void *)&xdqblk);
774297
+	if (ret < 0 && (errno == ENOSYS || errno == EINVAL)) {
774297
+		if (!XFS_USRQUOTA(h) && !XFS_GRPQUOTA(h))
774297
+			return 0;
774297
+		return generic_scan_dquots(h, process_dquot, xfs_get_dquot);
774297
+	}
774297
+	return xfs_kernel_scan_dquots(h, process_dquot);
774297
 }
774297
 
774297
 /*
774297
diff --git a/quotaio_xfs.h b/quotaio_xfs.h
774297
index 54725b0..2236da4 100644
774297
--- a/quotaio_xfs.h
774297
+++ b/quotaio_xfs.h
774297
@@ -46,6 +46,7 @@
774297
 #define Q_XSETQLIM   XQM_CMD(0x4)	/* set disk limits only */
774297
 #define Q_XGETQSTAT  XQM_CMD(0x5)	/* returns fs_quota_stat_t struct */
774297
 #define Q_XQUOTARM   XQM_CMD(0x6)	/* free quota files' space */
774297
+#define Q_XGETNEXTQUOTA	XQM_CMD(0x9)	/* get disk limits and usage >= ID */
774297
 
774297
 /*
774297
  * fs_disk_quota structure:
774297
-- 
774297
2.5.0
774297