[PATCH 2/4] xfsqa: make unmounting loop devices in 073 work again

Dave Chinner david at fromorbit.com
Mon Jan 11 22:41:07 CST 2010


Loop devices are now created and destroyed on demand, and
the existing hacks to do this no longer work. Remove them.

Signed-off-by: Dave Chinner <david at fromorbit.com>
---
 073 |   13 +------------
 1 files changed, 1 insertions(+), 12 deletions(-)

diff --git a/073 b/073
index 5059448..ac4c64f 100755
--- a/073
+++ b/073
@@ -3,15 +3,6 @@
 #
 # Test xfs_copy
 #
-# HACK WARNING:
-#
-# Due to the severe brokenness of mount's handling of loopback devices, we
-# hardcode the loop devices we use for this test. This enables us to clean up
-# the pieces when we remount the loop device because mount loses all trace of
-# the fact this is a loop device. Hence to enable us to unmount the hosting
-# filesystem, we need to manually tear down the relevant loop device. If
-# mount ever gets fixed then this hack can be removed.
-#
 #-----------------------------------------------------------------------
 # Copyright (c) 2000-2003,2008 Silicon Graphics, Inc.  All Rights Reserved.
 #
@@ -127,9 +118,7 @@ _verify_copy()
 	diff -u $tmp.geometry1 $tmp.geometry2
 
 	echo unmounting and removing new image
-	loop=`mount | grep $target | grep -o -e 'loop=.*[^),]' | grep -o -e '/.*$'`
-	umount $source $target
-	losetup -d $loop > /dev/null 2>&1
+	umount $source_dir $target_dir
 	rm -f $target
 }
 
-- 
1.6.5




More information about the xfs mailing list