[PATCH 2/2] xfstests: Use $MKFS_OPTIONS in _scratch_mkfs_*()

[Lukas Czerner]

Pass MKFS_OPTIONS to mkfs.$FSTYP in _scratch_mkfs_sized().
Preserve user defined MKFS_OPTIONS in _scratch_mkfs_geom().
---
 common.rc |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common.rc b/common.rc
index 65989c1..52b7125 100644
--- a/common.rc
+++ b/common.rc
@@ -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"
-- 
1.7.2.3