Skip to contentSkip to conversation

xfstests 073: unmount source image in cleanup

PATCH In review Eric Sandeen 2 participants 2 messages Jan 16, 2010 – Jan 17, 2010

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 xfstests 073: unmount source image in cleanup

Test 073 is currently failing w/ xfs_repair problems, and when it does, the whole series stops because the test dir still has a loopback mounted filesystem on it, and it can't unmount.

Fix that.

---

073 +1 -0
index 0ef9287..756c1c8 100755
@@ -44,6 +44,7 @@ _cleanup()
 	umount $SCRATCH_MNT 2>/dev/null
 	umount -d $imgs.loop 2>/dev/null
 	[ -d $imgs.loop ] && rmdir $imgs.loop
+	umount -d $imgs.source_dir 2>/dev/null
 	[ -d $imgs.source_dir ] && rm -rf $imgs.source_dir
 	rm -f $imgs.* $tmp.* /var/tmp/xfs_copy.log.*
 }

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs

Reviewed-by on v1 1/1
#1 lore raw
Quoted 14 lines · Eric Sandeen

Test 073 is currently failing w/ xfs_repair problems, and when it does, the whole series stops because the test dir still has a loopback mounted filesystem on it, and it can't unmount.

Fix that.

---

073 +0 -0
index 0ef9287..756c1c8 100755

073 _cleanup() · line 49

Quoted 6 lines
073 +1 -0
@@ -44,6 +44,7 @@ _cleanup()
 	umount $SCRATCH_MNT 2>/dev/null
 	umount -d $imgs.loop 2>/dev/null
 	[ -d $imgs.loop ] && rmdir $imgs.loop
+	umount -d $imgs.source_dir 2>/dev/null
 	[ -d $imgs.source_dir ] && rm -rf $imgs.source_dir
 	rm -f $imgs.* $tmp.* /var/tmp/xfs_copy.log.*

Yes, we should always unmount everything in the cleanup handler.

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs