common/rc: move XFS-specific parts of _scratch_options into common/xfs

Move all the non-XFS code in _scratch_options into a
_scratch_xfs_options helper in common/xfs, in preparation to add ext4
bits.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Zorro zlang <zlang@redhat.com>
Signed-off-by: Zorro Lang <zlang@kernel.org>

diff --git a/common/rc b/common/rc
index 52dd3b414aebe167b58bdf279263e58c9a9662f4..dc1d65c3cc9076e49e5dcbf21712fa8cd5e257c6 100644 (file)
--- a/common/rc
+++ b/common/rc
@@ -172,30 +172,13 @@ _clear_mount_stack()
 
 _scratch_options()
 {
-    local type=$1
-    local rt_opt=""
-    local log_opt=""
     SCRATCH_OPTIONS=""
 
-    if [ "$FSTYP" != "xfs" ]; then
-        return
-    fi
-
-    case $type in
-    mkfs)
-       SCRATCH_OPTIONS="$SCRATCH_OPTIONS -f"
-       rt_opt="-r"
-        log_opt="-l"
-       ;;
-    mount)
-       rt_opt="-o"
-        log_opt="-o"
+    case "$FSTYP" in
+    "xfs")
+       _scratch_xfs_options "$@"
        ;;
     esac
-    [ "$USE_EXTERNAL" = yes -a ! -z "$SCRATCH_RTDEV" ] && \
-       SCRATCH_OPTIONS="$SCRATCH_OPTIONS ${rt_opt}rtdev=$SCRATCH_RTDEV"
-    [ "$USE_EXTERNAL" = yes -a ! -z "$SCRATCH_LOGDEV" ] && \
-       SCRATCH_OPTIONS="$SCRATCH_OPTIONS ${log_opt}logdev=$SCRATCH_LOGDEV"
 }
 
 _test_options()

diff --git a/common/xfs b/common/xfs
index 9f84dffb8d2acf188ee05f68fdcce3741be6b889..f6f4cdd28baad914a055d27fba433a484585e463 100644 (file)
--- a/common/xfs
+++ b/common/xfs
@@ -265,6 +265,29 @@ _xfs_check()
        return $status
 }
 
+_scratch_xfs_options()
+{
+    local type=$1
+    local rt_opt=""
+    local log_opt=""
+
+    case $type in
+    mkfs)
+       SCRATCH_OPTIONS="$SCRATCH_OPTIONS -f"
+       rt_opt="-r"
+        log_opt="-l"
+       ;;
+    mount)
+       rt_opt="-o"
+        log_opt="-o"
+       ;;
+    esac
+    [ "$USE_EXTERNAL" = yes -a ! -z "$SCRATCH_RTDEV" ] && \
+       SCRATCH_OPTIONS="$SCRATCH_OPTIONS ${rt_opt}rtdev=$SCRATCH_RTDEV"
+    [ "$USE_EXTERNAL" = yes -a ! -z "$SCRATCH_LOGDEV" ] && \
+       SCRATCH_OPTIONS="$SCRATCH_OPTIONS ${log_opt}logdev=$SCRATCH_LOGDEV"
+}
+
 _scratch_xfs_db_options()
 {
        SCRATCH_OPTIONS=""