From e298c6b707e3fef3d9f1e93309c5525f88571de2 Mon Sep 17 00:00:00 2001
From: fsgqa <fsgqa>
Date: Mon, 2 Jun 2003 01:49:23 +0000
Subject: [PATCH] Ensure QA tests are run with all the mount options requested

---
 common.rc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/common.rc b/common.rc
index 38e7f710..5d248de1 100644
--- a/common.rc
+++ b/common.rc
@@ -78,7 +78,7 @@ _test_mount()
         TEST_OPTIONS="$TEST_OPTIONS -ortdev=$TEST_RTDEV"
     [ "$USE_EXTERNAL" = yes -a ! -z "$TEST_LOGDEV" ] && \
         TEST_OPTIONS="$TEST_OPTIONS -ologdev=$TEST_LOGDEV"
-    mount -t xfs $TEST_OPTIONS $* $TEST_DEV $TEST_DIR
+    mount -t xfs $TEST_OPTIONS $MOUNT_OPTIONS $* $TEST_DEV $TEST_DIR
 }
 
 _scratch_mount_options()
@@ -88,7 +88,7 @@ _scratch_mount_options()
         SCRATCH_OPTIONS="$SCRATCH_OPTIONS -ortdev=$SCRATCH_RTDEV"
     [ "$USE_EXTERNAL" = yes -a ! -z "$SCRATCH_LOGDEV" ] && \
         SCRATCH_OPTIONS="$SCRATCH_OPTIONS -ologdev=$SCRATCH_LOGDEV"
-    echo $SCRATCH_OPTIONS $* $SCRATCH_DEV $SCRATCH_MNT
+    echo $SCRATCH_OPTIONS $MOUNT_OPTIONS $* $SCRATCH_DEV $SCRATCH_MNT
 }
 
 _scratch_mount()
@@ -98,7 +98,7 @@ _scratch_mount()
         SCRATCH_OPTIONS="$SCRATCH_OPTIONS -ortdev=$SCRATCH_RTDEV"
     [ "$USE_EXTERNAL" = yes -a ! -z "$SCRATCH_LOGDEV" ] && \
         SCRATCH_OPTIONS="$SCRATCH_OPTIONS -ologdev=$SCRATCH_LOGDEV"
-    mount -t xfs $SCRATCH_OPTIONS $* $SCRATCH_DEV $SCRATCH_MNT
+    mount -t xfs $SCRATCH_OPTIONS $MOUNT_OPTIONS $* $SCRATCH_DEV $SCRATCH_MNT
 }
 
 _scratch_mkfs_options()