From: Jan Kara <jack@suse.cz>
To: Ted Tso <tytso@mit.edu>
Cc: <linux-ext4@vger.kernel.org>, Jan Kara <jack@suse.cz>
Subject: [PATCH 7/8] debugfs: Fix headers for quota commands
Date: Mon, 23 Aug 2021 17:41:27 +0200 [thread overview]
Message-ID: <20210823154128.16615-8-jack@suse.cz> (raw)
In-Reply-To: <20210823154128.16615-1-jack@suse.cz>
list_quota and get_quota commands have 'blocks' header while what they
actually show is a used space in bytes. Fix the header to state 'space'
instead.
Signed-off-by: Jan Kara <jack@suse.cz>
---
debugfs/quota.c | 4 ++--
tests/f_orphquot/expect | 4 ++--
tests/f_quota/expect.0 | 12 ++++++------
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/debugfs/quota.c b/debugfs/quota.c
index f792bd738781..1da1e03c6d88 100644
--- a/debugfs/quota.c
+++ b/debugfs/quota.c
@@ -123,7 +123,7 @@ void do_list_quota(int argc, char *argv[], int sci_idx EXT2FS_ATTR((unused)),
printf("%7s %2s %8s %8s %8s %8s %8s %8s\n",
quota_type[type], "id",
- "blocks", "quota", "limit", "inodes", "quota", "limit");
+ "space", "quota", "limit", "inodes", "quota", "limit");
qh = current_qctx->quota_file[type];
retval = qh->qh_ops->scan_dquots(qh, list_quota_callback, NULL);
if (retval) {
@@ -158,7 +158,7 @@ void do_get_quota(int argc, char *argv[], int sci_idx EXT2FS_ATTR((unused)),
printf("%7s %2s %8s %8s %8s %8s %8s %8s\n",
quota_type[type], "id",
- "blocks", "quota", "limit", "inodes", "quota", "limit");
+ "space", "quota", "limit", "inodes", "quota", "limit");
qh = current_qctx->quota_file[type];
diff --git a/tests/f_orphquot/expect b/tests/f_orphquot/expect
index f1f0b446c5d1..0f75decd16bd 100644
--- a/tests/f_orphquot/expect
+++ b/tests/f_orphquot/expect
@@ -8,9 +8,9 @@ Pass 5: Checking group summary information
test_filesystem: ***** FILE SYSTEM WAS MODIFIED *****
test_filesystem: 11/512 files (9.1% non-contiguous), 1070/2048 blocks
Exit status is 0
- user id blocks quota limit inodes quota limit
+ user id space quota limit inodes quota limit
0 20480 0 0 2 0 0
1000 0 5000 6000 0 50 60
- group id blocks quota limit inodes quota limit
+ group id space quota limit inodes quota limit
0 20480 0 0 2 0 0
100 0 6000 7000 0 60 70
diff --git a/tests/f_quota/expect.0 b/tests/f_quota/expect.0
index eb5294ee2288..26454856699d 100644
--- a/tests/f_quota/expect.0
+++ b/tests/f_quota/expect.0
@@ -1,21 +1,21 @@
debugfs: list_quota user
- user id blocks quota limit inodes quota limit
+ user id space quota limit inodes quota limit
0 13312 0 0 2 0 0
34 1024 0 0 1 0 0
100 2048 32 50 2 20 30
debugfs: list_quota group
- group id blocks quota limit inodes quota limit
+ group id space quota limit inodes quota limit
0 16384 0 0 5 0 0
debugfs: get_quota user 0
- user id blocks quota limit inodes quota limit
+ user id space quota limit inodes quota limit
0 13312 0 0 2 0 0
debugfs: get_quota user 100
- user id blocks quota limit inodes quota limit
+ user id space quota limit inodes quota limit
100 2048 32 50 2 20 30
debugfs: get_quota user 34
- user id blocks quota limit inodes quota limit
+ user id space quota limit inodes quota limit
34 1024 0 0 1 0 0
debugfs: get_quota group 0
- group id blocks quota limit inodes quota limit
+ group id space quota limit inodes quota limit
0 16384 0 0 5 0 0
debugfs:
--
2.26.2
next prev parent reply other threads:[~2021-08-23 15:42 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-23 15:41 [PATCH 0/8 v2] Quota fixes for e2fsprogs Jan Kara
2021-08-23 15:41 ` [PATCH 1/8] quota: Add support to version 0 quota format Jan Kara
2021-09-30 17:32 ` Theodore Ts'o
2021-08-23 15:41 ` [PATCH 2/8] quota: Fold quota_read_all_dquots() into quota_update_limits() Jan Kara
2021-08-23 15:41 ` [PATCH 3/8] quota: Rename quota_update_limits() to quota_read_all_dquots() Jan Kara
2021-08-23 15:41 ` [PATCH 4/8] tune2fs: Fix conversion of quota files Jan Kara
2021-08-23 15:41 ` [PATCH 5/8] e2fsck: Do not trash user limits when processing orphan list Jan Kara
2021-08-23 15:41 ` [PATCH 6/8] tests: Expand test checking quota and orphan processing interaction Jan Kara
2021-08-23 15:41 ` Jan Kara [this message]
2021-08-23 15:41 ` [PATCH 8/8] quota: Drop dead code Jan Kara
2021-09-15 9:30 ` [PATCH 0/8 v2] Quota fixes for e2fsprogs Jan Kara
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210823154128.16615-8-jack@suse.cz \
--to=jack@suse.cz \
--cc=linux-ext4@vger.kernel.org \
--cc=tytso@mit.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).