[PATCH 02/13] common: add a SCRATCH_MKFS_OPTIONS variable

[Christoph Hellwig <hch@lst.de>]

Add a new SCRATCH_MKFS_OPTIONS variable, which contains options that are
only applied to the actualy scratch device, but not to various other
devices like scsi_debug or loop devices created by various test.

This is important to support mkfs options that do not work on arbitrary
devices, like the extended LBA based data checksum support.

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 README    | 2 ++
 common/rc | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/README b/README
index 8644f163b1ab..cc03f51e1ad3 100644
--- a/README
+++ b/README
@@ -303,6 +303,8 @@ Extra SCRATCH device specifications:
  - Set SCRATCH_LOGDEV to "device for scratch-fs external log"
  - Set SCRATCH_RTDEV to "device for scratch-fs realtime data"
  - If SCRATCH_LOGDEV and/or SCRATCH_RTDEV, the USE_EXTERNAL environment
+ - Set SCRARCH_MKFS_OPTIONS if you want to specify additional mkfs options
+   to be used when creating file system on SCRATCH_DEV.
 
 Tape device specification for xfsdump testing:
  - Set TAPE_DEV to "tape device for testing xfsdump".
diff --git a/common/rc b/common/rc
index 3958ac934980..7fc5ff956959 100644
--- a/common/rc
+++ b/common/rc
@@ -805,12 +805,14 @@ _scratch_do_mkfs()
 	local mkfs_filter=$2
 	shift 2
 	local extra_mkfs_options=$*
+	local mkfs_options
 	local mkfs_status
 	local tmp=`mktemp -u`
 
 	# save mkfs output in case conflict means we need to run again.
 	# only the output for the mkfs that applies should be shown
-	eval "$mkfs_cmd $MKFS_OPTIONS $extra_mkfs_options $SCRATCH_DEV" \
+	mkfs_options="$MKFS_OPTIONS $SCRATCH_MKFS_OPTIONS $extra_mkfs_options"
+	eval "$mkfs_cmd $mkfs_options $SCRATCH_DEV" \
 		2>$tmp.mkfserr 1>$tmp.mkfsstd
 	mkfs_status=$?
 
-- 
2.53.0