]> git.apps.os.sepia.ceph.com Git - xfstests-dev.git/commitdiff
common/rc: drop SGI DMF specific _mount_ops_filter
authorDavid Disseldorp <ddiss@suse.de>
Tue, 10 Jan 2023 22:22:43 +0000 (23:22 +0100)
committerZorro Lang <zlang@kernel.org>
Sat, 14 Jan 2023 13:45:04 +0000 (21:45 +0800)
The _mount() helper function is the only caller of _mount_ops_filter(),
which appears to have been used in the past to replace the SGI DMF
specific mtpt= mount option setting.

_mount() invocations could now be replaced with $MOUNT_PROG calls
directly, but I've retained the helper function for readability.

Link: https://irix7.com/techpubs/007-3683-007.pdf
Signed-off-by: David Disseldorp <ddiss@suse.de>
Reviewed-by: Zorro Lang <zlang@redhat.com>
Signed-off-by: Zorro Lang <zlang@kernel.org>
common/rc

index 23530413ec10fdcfaa12d24ce4395dc11076aa36..81ce10269106e69073293f1a5c5b4a4247ca80a5 100644 (file)
--- a/common/rc
+++ b/common/rc
@@ -120,7 +120,7 @@ _get_hugepagesize()
 
 _mount()
 {
-    $MOUNT_PROG `_mount_ops_filter $*`
+    $MOUNT_PROG $*
 }
 
 # Call _mount to do mount operation but also save mountpoint to
@@ -211,19 +211,6 @@ _test_options()
        TEST_OPTIONS="$TEST_OPTIONS ${log_opt}logdev=$TEST_LOGDEV"
 }
 
-_mount_ops_filter()
-{
-    local params="$*"
-    local last_index=$(( $# - 1 ))
-
-    [ $last_index -gt 0 ] && shift $last_index
-    local fs_escaped=$1
-
-    echo $params | \
-        $PERL_PROG -ne "s#mtpt=[^,|^\n|^\s]*#mtpt=$fs_escaped\1\2#; print;"
-
-}
-
 # Used for mounting non-scratch devices (e.g. loop, dm constructs)
 # with the safe set of scratch mount options (e.g. loop image may be
 # hosted on $SCRATCH_DEV, so can't use external scratch devices).