From: Allan Randall <allanr@sgi.com>
Date: Thu, 4 Jan 2007 05:12:36 +0000 (+0000)
Subject: _dmapi_scratch_mount changes
X-Git-Tag: v1.1.0~535
X-Git-Url: http://git.apps.os.sepia.ceph.com/?p=xfstests-dev.git;a=commitdiff_plain;h=e9c53c45a1fb85f44769a8324ebcc6fac2621599

_dmapi_scratch_mount changes
Merge of master-melb:xfs-cmds:27847a by kenmcd.

  changed _dmapi_scratch_mount to determine dmapi support by attempting to mount the filesystem with the dmapi mount option and checking it succeeds
---

diff --git a/common.dmapi b/common.dmapi
index 10409c30..23968108 100644
--- a/common.dmapi
+++ b/common.dmapi
@@ -13,15 +13,17 @@ DMAPI_QASUITE2_DIR=$here/dmapi/src/suite2/
 DMAPI_LS_TO_COPY_PATH=$DMAPI_QASUITE2_DIR/bindir/ls_to_copy
 
 _dmapi_scratch_mount () {
-    if [ `lsmod | grep -c dmapi` -gt 0 ] ; then
-        if [ `echo "$MOUNT_OPTIONS" | grep -c dmapi` -gt 0 -o \
-            `echo "$MOUNT_OPTIONS" | grep -c dmi` -gt 0 ] ; then
-            #already got dmapi options set
-            _scratch_mount
-        else
-            _scratch_mount "-o dmapi,mtpt=$SCRATCH_MNT"
-        fi
+    if [ `echo "$MOUNT_OPTIONS" | grep -c dmapi` -gt 0 -o \
+        `echo "$MOUNT_OPTIONS" | grep -c dmi` -gt 0 ] ; then
+        #already got dmapi options set
+        _scratch_mount
+        dmapi_mount_result=$?
     else
-        _notrun "DMAPI modules not loaded"
+        _scratch_mount "-o dmapi,mtpt=$SCRATCH_MNT"
+        dmapi_mount_result=$?
     fi
-}
+
+    if [ $dmapi_mount_result -ne 0 ] ; then
+        _notrun "Assuming DMAPI modules are not loaded"
+    fi
+}
\ No newline at end of file