mirror of
https://github.com/linux-apfs/apfstests.git
synced 2026-05-01 15:01:44 -07:00
shared/289: do not special-case ext3
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. Signed-off-by: Eryu Guan <eguan@redhat.com> Reviewed-by: Eric Sandeen <sandeen@redhat.com> Signed-off-by: Dave Chinner <david@fromorbit.com>
This commit is contained in:
+1
-12
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user