Log Message:
-----------
Don't need to see stderr from 'dd'.
Unmount the /n/lower/bN mount point not the device itself.

Tags:
----
LKML-branch

Modified Files:
--------------
    unionfs/regression-2.0:
        ChangeLog (r1.1.2.17 -> r1.1.2.18)
        run-tests (r1.1.2.6 -> r1.1.2.7)

Revision Data
-------------
Index: ChangeLog
===================================================================
RCS file: /home/cvs/unionfs/unionfs/regression-2.0/Attic/ChangeLog,v
retrieving revision 1.1.2.17
retrieving revision 1.1.2.18
diff -Lregression-2.0/ChangeLog -Lregression-2.0/ChangeLog -u -d -b -B -p 
-r1.1.2.17 -r1.1.2.18
--- regression-2.0/ChangeLog
+++ regression-2.0/ChangeLog
@@ -1,6 +1,8 @@
 2007-05-22  Erez Zadok  <[EMAIL PROTECTED]>
 
        * run-tests: minor cleanup.
+       Don't need to see stderr from 'dd'.
+       Unmount the /n/lower/bN mount point not the device itself.
 
 2007-05-19  Erez Zadok  <[EMAIL PROTECTED]>
 
Index: run-tests
===================================================================
RCS file: /home/cvs/unionfs/unionfs/regression-2.0/Attic/run-tests,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -Lregression-2.0/run-tests -Lregression-2.0/run-tests -u -d -b -B -p 
-r1.1.2.6 -r1.1.2.7
--- regression-2.0/run-tests
+++ regression-2.0/run-tests
@@ -78,7 +78,7 @@ function setup_lower
 
        case "$dev" in
                /dev/loop*)
-                       runcmd dd if=/dev/zero of=/tmp/fs.$$.$i bs=1024k 
count=1 seek=100
+                       runcmd dd if=/dev/zero of=/tmp/fs.$$.$i bs=1024k 
count=1 seek=100 2> /dev/null
                        runcmd losetup $dev /tmp/fs.$$.$i
                        ;;
                *)
@@ -93,10 +93,12 @@ function setup_lower
 
 function do_umount
 {
-       runcmd umount $1
-       case "$1" in
+       branch=$1
+       dev=$2
+       runcmd umount /n/lower/b$branch
+       case "$dev" in
                /dev/loop*)
-                       runcmd losetup -d $1
+                       runcmd losetup -d $dev
                        ;;
                *)
                        ;;
@@ -130,7 +132,7 @@ do
 
   # try to unmount lower file systems (check if we leak anything)
   for i in 0 1 2 3 ; do
-      do_umount $(eval echo \$DEV$i)
+      do_umount $i $(eval echo \$DEV$i)
   done
   # unload unionfs module (check if we leak anything)
   runcmd rmmod unionfs
_______________________________________________
unionfs-cvs mailing list: http://unionfs.filesystems.org/
[email protected]
http://www.fsl.cs.sunysb.edu/mailman/listinfo/unionfs-cvs

Reply via email to