From: Erez Zadok <ezk@cs.sunysb.edu>
Date: Fri, 19 Oct 2007 20:52:39 +0000 (-0400)
Subject: Eliminate need for mtdblock module when using jffs2.
X-Git-Url: https://git.fsl.cs.sunysb.edu/?a=commitdiff_plain;h=b8ef2409da427a3992f117863bebc5993c2b551b;p=unionfs-regression-odf.git

Eliminate need for mtdblock module when using jffs2.
---

diff --git a/run-tests b/run-tests
index 01376f7..976ce69 100755
--- 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