[PATCH] xfs: pass extra params to _scratch_mkfs_xfs_opts in _scratch_mkfs_xfs

[Eryu Guan <guaneryu@gmail.com>]

One of _scratch_mkfs_xfs_opts()'s job is to remove any metadata
related mkfs options if mkfs.xfs binary doesn't support them, so
that tests that pass metadata mkfs options to _scratch_mkfs, e.g.
"_scratch_mkfs -m crc=0" won't break with old mkfs.xfs.

But commit 596a068bf130 ("fstests: teach _scratch_mkfs to handle
mkfs option conflicts") broke this, because it didn't pass any mkfs
options to _scratch_mkfs_xfs_opts(). So fix it.

Also declare a variable as 'local' and fix a typo.

Reported-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Eryu Guan <guaneryu@gmail.com>
---
 common/xfs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/xfs b/common/xfs
index e0bc3f43d3c5..498f45e64b6d 100644
--- a/common/xfs
+++ b/common/xfs
@@ -46,9 +46,9 @@ _setup_large_xfs_fs()
 
 _scratch_mkfs_xfs_opts()
 {
-	mkfs_opts=$*
+	local mkfs_opts=$*
 
-	# remove metadata related mkfs options if mkfs.xfs doesn't them
+	# remove metadata related mkfs options if mkfs.xfs doesn't support them
 	if [ -n "$XFS_MKFS_HAS_NO_META_SUPPORT" ]; then
 		mkfs_opts=`echo $mkfs_opts | sed "s/-m\s\+\S\+//g"`
 	fi
@@ -79,14 +79,14 @@ _scratch_mkfs_xfs_supported()
 
 _scratch_mkfs_xfs()
 {
-	local mkfs_cmd="`_scratch_mkfs_xfs_opts`"
+	local mkfs_cmd="`_scratch_mkfs_xfs_opts $*`"
 	local mkfs_filter="sed -e '/less than device physical sector/d' \
 			       -e '/switching to logical sector/d' \
 			       -e '/Default configuration/d'"
 	local tmp=`mktemp -u`
 	local mkfs_status
 
-	_scratch_do_mkfs "$mkfs_cmd" "$mkfs_filter" $* 2>$tmp.mkfserr 1>$tmp.mkfsstd
+	_scratch_do_mkfs "$mkfs_cmd" "$mkfs_filter" 2>$tmp.mkfserr 1>$tmp.mkfsstd
 	mkfs_status=$?
 
 
-- 
2.17.0