From 22418226016a589a2ea355f1965f4123276e6bb8 Mon Sep 17 00:00:00 2001
From: jkar8572 <jkar8572>
Date: Mon, 14 Jun 2010 10:06:04 +0000
Subject: For XFS, quotaon -f should turn off only limit enforcement as
 described in the manpage (Eric Sandeen)

---
 Changelog     | 1 +
 quotaon_xfs.c | 7 +++----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Changelog b/Changelog
index 622ba70..69d56ad 100644
--- a/Changelog
+++ b/Changelog
@@ -1,4 +1,5 @@
 Changes in quota-tools from 3.17 to 4.00-pre2
+* fix quotaon to turn off only limit enforcement on XFS (Eric Sandeen)
 * fix quotaon to print all informational messages only in verbose mode (Jan Kara)
 * fix warnquota manpage to not speak about RPC (Jan Kara)
 * fix repquota to get latest quota info header (Jan Kara)
diff --git a/quotaon_xfs.c b/quotaon_xfs.c
index d19f31b..9cafbd9 100644
--- a/quotaon_xfs.c
+++ b/quotaon_xfs.c
@@ -207,10 +207,9 @@ int xfs_newstate(struct mntent *mnt, int type, char *xarg, int flags)
 	}
 #endif /* XFS_ROOTHACK */
 
-	if (xarg == NULL) {	/* both acct & enfd on/off */
-		xopts |= (type == USRQUOTA) ?
-			(XFS_QUOTA_UDQ_ACCT | XFS_QUOTA_UDQ_ENFD) :
-			(XFS_QUOTA_GDQ_ACCT | XFS_QUOTA_GDQ_ENFD);
+	if (xarg == NULL) {	/* only enfd on/off */
+		xopts |= (type == USRQUOTA) ? XFS_QUOTA_UDQ_ENFD :
+			XFS_QUOTA_GDQ_ENFD;
 		err = xfs_onoff((char *)dev, type, flags, roothack, xopts);
 	}
 	else if (strcmp(xarg, "account") == 0) {
-- 
cgit v1.2.3