mirror of
https://github.com/linux-apfs/apfstests.git
synced 2026-05-01 15:01:44 -07:00
xfs/096: strip log stripe warnings from mkfs.xfs
The warnings have been removed when stripe unit/width are too big for the log stripe unit to be set. Hence add them to the mkfs.xfs filter and strip them from golden output file so the test succeeds on both new and old mfks binaries. Signed-off-by: Dave Chinner <dchinner@redhat.com> Reviewed-by: Brian Foster <bfoster@redhat.com> Signed-off-by: Dave Chinner <david@fromorbit.com>
This commit is contained in:
committed by
Dave Chinner
parent
b3db9ca464
commit
c7aa9d3cb0
+3
-1
@@ -88,6 +88,8 @@ _mkfs_filter()
|
||||
-e '/.*crc=/d' \
|
||||
-e 's/ *$//' \
|
||||
-e 's/ ftype=[01]//' \
|
||||
-e '/^log stripe unit.*too large/d' \
|
||||
-e '/^log stripe unit adjusted/d' \
|
||||
| grep -v parent
|
||||
}
|
||||
|
||||
@@ -143,7 +145,7 @@ do
|
||||
fi
|
||||
echo "--- mkfs=$mkfs ---"
|
||||
export MKFS_OPTIONS="$mkfs"
|
||||
_scratch_mkfs_xfs | _mkfs_filter
|
||||
_scratch_mkfs_xfs 2>&1 | _mkfs_filter
|
||||
echo ""
|
||||
echo ""
|
||||
done
|
||||
|
||||
@@ -7,8 +7,6 @@ log stripe unit (262656) must be a multiple of the block size (4096)
|
||||
|
||||
# test log stripe greater than LR size
|
||||
--- mkfs=-l version=2,su=266240 ---
|
||||
log stripe unit (266240 bytes) is too large (maximum is 256KiB)
|
||||
log stripe unit adjusted to 32KiB
|
||||
meta-data=DEV isize=256 agcount=N, agsize=N blks
|
||||
data = bsize=4096 blocks=N, imaxpct=N
|
||||
= sunit=0 swidth=0 blks, unwritten=1
|
||||
|
||||
@@ -7,8 +7,6 @@ log stripe unit (262656) must be a multiple of the block size (4096)
|
||||
|
||||
# test log stripe greater than LR size
|
||||
--- mkfs=-l version=2,su=266240 ---
|
||||
log stripe unit (266240 bytes) is too large (maximum is 256KiB)
|
||||
log stripe unit adjusted to 32KiB
|
||||
meta-data=DEV isize=256 agcount=N, agsize=N blks
|
||||
data = bsize=4096 blocks=N, imaxpct=N
|
||||
= sunit=0 swidth=0 blks, unwritten=1
|
||||
@@ -20,8 +18,6 @@ realtime =REALTIME extsz=N, blocks=N, rtextents=N
|
||||
|
||||
# same test but get log stripe from data stripe
|
||||
--- mkfs=-l version=2 -d su=266240,sw=1 ---
|
||||
log stripe unit (266240 bytes) is too large (maximum is 256KiB)
|
||||
log stripe unit adjusted to 32KiB
|
||||
meta-data=DEV isize=256 agcount=N, agsize=N blks
|
||||
data = bsize=4096 blocks=N, imaxpct=N
|
||||
= sunit=65 swidth=65 blks, unwritten=1
|
||||
|
||||
Reference in New Issue
Block a user