mirror of
https://github.com/linux-apfs/apfstests.git
synced 2026-05-01 15:01:44 -07:00
xfstests: Use $MKFS_OPTIONS in _scratch_mkfs_*()
Pass MKFS_OPTIONS to mkfs.$FSTYP in _scratch_mkfs_sized(). Preserve user defined MKFS_OPTIONS in _scratch_mkfs_geom(). Signed-off-by: Lukas Czerner <lczerner@redhat.com> Signed-off-by: Eric Sandeen <sandeen@redaht.com>
This commit is contained in:
committed by
Eric Sandeen
parent
095e690221
commit
5715240aee
@@ -327,7 +327,7 @@ _scratch_mkfs_sized()
|
||||
_scratch_mkfs_xfs -d size=$fssize -b size=$blocksize
|
||||
;;
|
||||
ext2|ext3|ext4)
|
||||
/sbin/mkfs.$FSTYP -b $blocksize $SCRATCH_DEV $blocks
|
||||
/sbin/mkfs.$FSTYP $MKFS_OPTIONS -b $blocksize $SCRATCH_DEV $blocks
|
||||
;;
|
||||
*)
|
||||
_notrun "Filesystem $FSTYP not supported in _scratch_mkfs_sized"
|
||||
@@ -349,10 +349,10 @@ _scratch_mkfs_geom()
|
||||
|
||||
case $FSTYP in
|
||||
xfs)
|
||||
MKFS_OPTIONS="-b size=$blocksize, -d su=$sunit_bytes,sw=$swidth_mult"
|
||||
MKFS_OPTIONS+="-b size=$blocksize, -d su=$sunit_bytes,sw=$swidth_mult"
|
||||
;;
|
||||
ext4)
|
||||
MKFS_OPTIONS="-b $blocksize -E stride=$sunit_blocks,stripe_width=$swidth_blocks"
|
||||
MKFS_OPTIONS+="-b $blocksize -E stride=$sunit_blocks,stripe_width=$swidth_blocks"
|
||||
;;
|
||||
*)
|
||||
_notrun "can't mkfs $FSTYP with geometry"
|
||||
|
||||
Reference in New Issue
Block a user