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 536cacf659049a1fed9708746dbca4164e09a254..3e2f80dca1b88d7bf2b6b19a04afc9723745ddee 100644 (file)
--- 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 f9150879df6690e4fadcd15d32feb7d1c37a3b84..78f21645f901567446d58fe5fa76db42df68d140 100644 (file)
--- 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 10e78f4b1aeb5d546c8ce25e121e05448539ba31..274bfe63c56ec30fb1de3b73e01139e81b681ec5 100644 (file)
--- 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];