Merge of master-melb:xfs-cmds:26322a by kenmcd.
fixed mkfs options to stop failure when sunit and swidth are set as MKFS_OPTIONS.
_require_scratch
_require_loop
_require_scratch
_require_loop
+MKFS_OPTIONS="" #ignore external MKFS_OPTIONS
_scratch_mkfs_xfs -dsize=41m,agcount=2 | _filter_mkfs 2>/dev/null
_scratch_mount 2>/dev/null || _fail "initial scratch mount failed"
_scratch_mkfs_xfs -dsize=41m,agcount=2 | _filter_mkfs 2>/dev/null
_scratch_mount 2>/dev/null || _fail "initial scratch mount failed"