Blame quota-4.00_pre1-fix-repquota-to-get-latest-quota-info-header.patch

375919
From b58944b582722dd3c56893eb4b6c8b8a0291201d Mon Sep 17 00:00:00 2001
375919
From: jkar8572 <jkar8572>
375919
Date: Thu, 27 May 2010 13:12:57 +0000
375919
Subject: [PATCH] * fix repquota to get latest quota info header (Jan Kara)
375919
375919
Petr Pisar: Changelog entry removed.
375919
375919
---
375919
 quotaio.c    |    9 +++++++++
375919
 quotaio_v1.c |    5 -----
375919
 quotaio_v2.c |    5 -----
375919
375919
diff --git a/quotaio.c b/quotaio.c
375919
index 533b631..ee8c48a 100644
375919
--- a/quotaio.c
375919
+++ b/quotaio.c
375919
@@ -147,6 +147,15 @@ struct quota_handle *init_io(struct mntent *mnt, int type, int fmt, int flags)
375919
 		}
375919
 	}
375919
 	if (!QIO_ENABLED(h) || flags & IOI_OPENFILE) {	/* Need to open file? */
375919
+		if (QIO_ENABLED(h)) {	/* Kernel uses same file? */
375919
+			unsigned int cmd =
375919
+				(kernel_iface == IFACE_GENERIC) ? Q_SYNC : Q_6_5_SYNC;
375919
+			if (quotactl(QCMD(cmd, h->qh_type), h->qh_quotadev,
375919
+				     0, NULL) < 0) {
375919
+				die(4, _("Cannot sync quotas on device %s: %s\n"),
375919
+				    h->qh_quotadev, strerror(errno));
375919
+			}
375919
+		}
375919
 		/* We still need to open file for operations like 'repquota' */
375919
 		if ((fd = open(qfname, QIO_RO(h) ? O_RDONLY : O_RDWR)) < 0) {
375919
 			errstr(_("Cannot open quotafile %s: %s\n"),
375919
diff --git a/quotaio_v1.c b/quotaio_v1.c
375919
index 0edbc16..1533ffc 100644
375919
--- a/quotaio_v1.c
375919
+++ b/quotaio_v1.c
375919
@@ -348,11 +348,6 @@ static int v1_scan_dquots(struct quota_handle *h, int (*process_dquot) (struct d
375919
 	struct dquot *dquot = get_empty_dquot();
375919
 	qid_t id = 0;
375919
 
375919
-	if (QIO_ENABLED(h))	/* Kernel uses same file? */
375919
-		if (quotactl(QCMD((kernel_iface == IFACE_GENERIC) ? Q_SYNC : Q_6_5_SYNC, h->qh_type),
375919
-			     h->qh_quotadev, 0, NULL) < 0)
375919
-			die(4, _("Cannot sync quotas on device %s: %s\n"), h->qh_quotadev,
375919
-			    strerror(errno));
375919
 	memset(dquot, 0, sizeof(*dquot));
375919
 	dquot->dq_h = h;
375919
 	lseek(h->qh_fd, 0, SEEK_SET);
375919
diff --git a/quotaio_v2.c b/quotaio_v2.c
375919
index 2e3c725..38440e7 100644
375919
--- a/quotaio_v2.c
375919
+++ b/quotaio_v2.c
375919
@@ -484,11 +484,6 @@ static int v2_commit_dquot(struct dquot *dquot, int flags)
375919
 
375919
 static int v2_scan_dquots(struct quota_handle *h, int (*process_dquot) (struct dquot *, char *))
375919
 {
375919
-	if (QIO_ENABLED(h))	/* Kernel uses same file? */
375919
-		if (quotactl(QCMD((kernel_iface == IFACE_GENERIC) ? Q_SYNC : Q_6_5_SYNC, h->qh_type),
375919
-			     h->qh_quotadev, 0, NULL) < 0)
375919
-			die(4, _("Cannot sync quotas on device %s: %s\n"), h->qh_quotadev,
375919
-			    strerror(errno));
375919
 	return qtree_scan_dquots(h, process_dquot);
375919
 }
375919
 
375919
-- 
375919
1.7.4
375919