xfs
[Top] [All Lists]

[PATCH] xfsprogs: xfs_quota: don't print invalid quota file inode number

To: xfs@xxxxxxxxxxx
Subject: [PATCH] xfsprogs: xfs_quota: don't print invalid quota file inode number
From: Alex Elder <aelder@xxxxxxx>
Date: Wed, 28 Sep 2011 06:15:37 -0500
Cc: Alex Elder <aelder@xxxxxxx>
When the state of quota files is dumped, xfs_quota blindly shows
whatever inode number is returned by the kernel.  If one of the
quota types is not enabled or enforced, the inode number provided
is an invalid value ((__u64) -1).  Rather than print a meaningless
large integer, print "N/A" in its place to make interpreting the
result it a little more obvious.

Signed-off-by: Alex Elder <aelder@xxxxxxx>
---
 quota/state.c |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/quota/state.c b/quota/state.c
index 3862e67..42bffc0 100644
--- a/quota/state.c
+++ b/quota/state.c
@@ -122,10 +122,13 @@ state_qfilestat(
                mount->fs_dir, mount->fs_name);
        fprintf(fp, _("  Accounting: %s\n"), accounting ? _("ON") : _("OFF"));
        fprintf(fp, _("  Enforcement: %s\n"), enforcing ? _("ON") : _("OFF"));
-       fprintf(fp, _("  Inode: #%llu (%llu blocks, %lu extents)\n"),
-               (unsigned long long)qfs->qfs_ino,
-               (unsigned long long)qfs->qfs_nblks,
-               (unsigned long)qfs->qfs_nextents);
+       if (qfs->qfs_ino != (__u64) -1)
+               fprintf(fp, _("  Inode: #%llu (%llu blocks, %lu extents)\n"),
+                       (unsigned long long)qfs->qfs_ino,
+                       (unsigned long long)qfs->qfs_nblks,
+                       (unsigned long)qfs->qfs_nextents);
+       else
+               fprintf(fp, _("  Inode: N/A\n"));
 }
 
 static void
-- 
1.7.6.2

<Prev in Thread] Current Thread [Next in Thread>