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
e6d8fb3 ext3: Count internal 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.
Signed-off-by: Eryu Guan <eguan@xxxxxxxxxx>
---
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
--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
