From: Donald Douwsma <donaldd@sgi.com>
Date: Mon, 19 Feb 2007 14:54:20 +0000 (+0000)
Subject: Fix grace time display problems in xfs_quota
X-Git-Tag: v2.9.0~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=44214b5af77858762207691ff6aaed590eab5d7e;p=thirdparty%2Fxfsprogs-dev.git

Fix grace time display problems in xfs_quota
Merge of master-melb:xfs-cmds:28131a by kenmcd.
---

diff --git a/doc/CHANGES b/doc/CHANGES
index 536cacf65..3e2f80dca 100644
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,3 +1,7 @@
+xfsprogs-2.8.XX
+	- Fix xfs_quota gracetime reporting.
+	  Thanks to Utako Kusaka <utako@tnes.nec.co.jp> for this.
+
 xfsprogs-2.8.19 (31 January 2007)
 	- Fix pthread stack size setting in xfs_repair.
 	- Fix xfs_bmap -n option displaying a truncated extent.
diff --git a/quota/quota.h b/quota/quota.h
index f9150879d..78f21645f 100644
--- a/quota/quota.h
+++ b/quota/quota.h
@@ -49,7 +49,7 @@ enum {
  */
 extern char *type_to_string(uint __type);
 extern char *form_to_string(uint __form);
-extern char *time_to_string(__uint32_t __time, uint __flags);
+extern char *time_to_string(time_t __time, uint __flags);
 extern char *bbs_to_string(__uint64_t __v, char *__c, uint __size);
 extern char *num_to_string(__uint64_t __v, char *__c, uint __size);
 extern char *pct_to_string(__uint64_t __v, __uint64_t __t, char *__c, uint __s);
diff --git a/quota/util.c b/quota/util.c
index 10e78f4b1..274bfe63c 100644
--- a/quota/util.c
+++ b/quota/util.c
@@ -29,7 +29,7 @@
 
 char *
 time_to_string(
-	__uint32_t	origin,
+	time_t		origin,
 	uint		flags)
 {
 	static char	timestamp[32];