Eliminate need for mtdblock module when using jffs2.

diff --git a/run-tests b/run-tests
index d8a4874e8776ebc9bf817c25e0a20b129d1d5e5e..f0196cc6e1b68aa544cfddb16c8f6193e89781f3 100755 (executable)
--- a/run-tests
+++ b/run-tests
@@ -116,7 +116,6 @@ function setup_lower
                runcmd mount -t $fs $versopt localhost:/n/export/b$i /n/lower/b$i
                ;;
            jffs2 )
-               runcmd modprobe mtdblock
                case "`uname -r`" in
                    2.6.9* )
                        runcmd modprobe blkmtd device=$dev,128ki
@@ -125,8 +124,7 @@ function setup_lower
                        runcmd modprobe block2mtd block2mtd=$dev,128ki
                        ;;
                esac
-               runcmd sync     # work around race bug in block2mtd
-               runcmd mount -t $fs /dev/mtdblock$i /n/lower/b$i
+               runcmd mount -t $fs mtd$i /n/lower/b$i
                ;;
            reiserfs )
                # reiserfs v3 mkfs command does not honor the -q flag
@@ -179,8 +177,15 @@ function do_umount
                runcmd exportfs -u localhost:/
            ;;
        jffs2 )
-           runcmd rmmod block2mtd
-           runcmd rmmod mtdblock
+           case "`uname -r`" in
+               2.6.9* )
+                   runcmd rmmod blkmtd
+                   ;;
+               * )
+                   runcmd rmmod block2mtd
+                   ;;
+           esac
+
            ;;
     esac
     case "$dev" in