From: Eryu Guan <eguan@redhat.com>
To: fstests@vger.kernel.org
Cc: linux-ext4@vger.kernel.org, Eryu Guan <eguan@redhat.com>
Subject: [PATCH v2] shared/289: do not special-case ext3
Date: Mon, 27 Apr 2015 23:51:00 +0800 [thread overview]
Message-ID: <1430149860-27321-1-git-send-email-eguan@redhat.com> (raw)
In-Reply-To: <1430134449-16060-1-git-send-email-eguan@redhat.com>
Commit "3574531 xfstests: count journal size in test 289" makes ext3 a
special case, but now it's not the case anymore after kernel commit
2046fd1 ext3: Count journal as bsddf overhead in ext3_statfs
So just remove the special case, now test passes on both ext3 and ext4,
also ext3 driven by ext4 module.
Reviewed-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: Eryu Guan <eguan@redhat.com>
---
v2:
- point to right kernel commit id in commit message
tests/shared/289 | 13 +------------
1 file changed, 1 insertion(+), 12 deletions(-)
diff --git a/tests/shared/289 b/tests/shared/289
index c53d38c..96c949d 100755
--- a/tests/shared/289
+++ b/tests/shared/289
@@ -58,18 +58,7 @@ TOTAL_BLOCKS=`dumpe2fs -h $SCRATCH_DEV 2>/dev/null \
FREE_BLOCKS=`dumpe2fs -h $SCRATCH_DEV 2>/dev/null \
| awk '/Free blocks:/{print $3}'`
-# ext3 doesn't count journal blocks as overhead, ext4 does.
-if [ $FSTYP = "ext3" ]; then
- JOURNAL_SIZE=`dumpe2fs -h $SCRATCH_DEV 2>/dev/null \
- | awk '/Journal size:/{print $3}' | _filter_size_to_bytes`
- BLOCK_SIZE=`dumpe2fs -h $SCRATCH_DEV 2>/dev/null \
- | awk '/Block size:/{print $3}'`
- JOURNAL_BLOCKS=$(($JOURNAL_SIZE/$BLOCK_SIZE))
-else
- JOURNAL_BLOCKS=0
-fi
-
-OVERHEAD=$(($TOTAL_BLOCKS-$FREE_BLOCKS-$JOURNAL_BLOCKS))
+OVERHEAD=$(($TOTAL_BLOCKS-$FREE_BLOCKS))
# bsddf|minixdf
# Set the behaviour for the statfs system call. The minixdf
--
2.1.0
prev parent reply other threads:[~2015-04-27 15:51 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-27 11:34 [PATCH] shared/289: do not special-case ext3 Eryu Guan
2015-04-27 15:18 ` Eric Sandeen
2015-04-27 15:44 ` Eryu Guan
2015-04-27 15:51 ` Eryu Guan [this message]
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=1430149860-27321-1-git-send-email-eguan@redhat.com \
--to=eguan@redhat.com \
--cc=fstests@vger.kernel.org \
--cc=linux-ext4@vger.kernel.org \
/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).