From 9f04804a8da0547a6d6d18bbd83501a5db164e1a Mon Sep 17 00:00:00 2001
From: jkar8572 <jkar8572>
Date: Wed, 27 Feb 2002 21:23:55 +0000
Subject: Fixed minor bug in grace time printing (Jan Kara) Fixed quotaon
 behaviour with "too new" kernels (Jan Kara)

---
 Changelog  | 4 +++-
 quotaon.c  | 6 +++++-
 repquota.c | 4 ++--
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/Changelog b/Changelog
index aeb1124..3974fcd 100644
--- a/Changelog
+++ b/Changelog
@@ -6,7 +6,9 @@ Changes in quota-tools from 3.03 to 3.04
 * added -q <quotatab> and -c <configfile> options to warnquota(8) (Jan Kara)
 * added some notes about quotatab to warnquota manpage (Jan Kara) 
 * fixed bug in options parsing of warnquota(8) (Michael Meskes)
-* Ignore automount mountpoints (Philippe Troin)
+* ignore automount mountpoints (Philippe Troin)
+* fixed minor bug in printing grace times (Jan Kara)
+* fixed quotaon(8) behaviour when it sees newer kernel then it's able to handle (Jan Kara)
 
 Changes in quota-tools from 3.02 to 3.03
 
diff --git a/quotaon.c b/quotaon.c
index 03d0149..7f8d3b8 100644
--- a/quotaon.c
+++ b/quotaon.c
@@ -34,7 +34,7 @@
 
 #ident "$Copyright: (c) 1980, 1990 Regents of the University of California $"
 #ident "$Copyright: All rights reserved. $"
-#ident "$Id: quotaon.c,v 1.12 2002/02/22 14:58:32 jkar8572 Exp $"
+#ident "$Id: quotaon.c,v 1.13 2002/02/27 21:23:55 jkar8572 Exp $"
 
 /*
  * Turn quota on/off for a filesystem.
@@ -173,6 +173,10 @@ int main(int argc, char **argv)
 	}
 
 	kqf = kern_quota_format();
+	if (kqf == QF_TOONEW) {
+		errstr(_("WARNING - Kernel quota newer than supported! Quota need not work properly.\n"));
+		kqf = 1 << QF_VFSV0;
+	}
 
 	if (init_mounts_scan(aflag ? 0 : argc, argv) < 0)
 		return 1;
diff --git a/repquota.c b/repquota.c
index 0197ff3..9157f50 100644
--- a/repquota.c
+++ b/repquota.c
@@ -133,7 +133,7 @@ static void print(struct dquot *dquot, char *name)
 	sstrncpy(pname, name, sizeof(pname));
 	if (flags & FL_TRUNCNAMES)
 		pname[PRINTNAMELEN] = 0;
-	if (entry->dqb_bsoftlimit && toqb(entry->dqb_curspace) >= entry->dqb_bsoftlimit)
+	if (entry->dqb_bsoftlimit && toqb(entry->dqb_curspace) > entry->dqb_bsoftlimit)
 		difftime2str(entry->dqb_btime, time);
 	else
 		time[0] = 0;
@@ -144,7 +144,7 @@ static void print(struct dquot *dquot, char *name)
 	       overlim(qb2kb(toqb(entry->dqb_curspace)), qb2kb(entry->dqb_bsoftlimit), qb2kb(entry->dqb_bhardlimit)),
 	       overlim(entry->dqb_curinodes, entry->dqb_isoftlimit, entry->dqb_ihardlimit),
 	       numbuf[0], numbuf[1], numbuf[2], time);
-	if (entry->dqb_isoftlimit && entry->dqb_curinodes >= entry->dqb_isoftlimit)
+	if (entry->dqb_isoftlimit && entry->dqb_curinodes > entry->dqb_isoftlimit)
 		difftime2str(entry->dqb_itime, time);
 	else
 		time[0] = 0;
-- 
cgit v1.2.3