generic/740: skip jffs2 as foreign fs earlier

Commit a633d252e3c4 ("shared/032: add options for jffs2") added a
check to skip checking the overwrite of jffs2, but only after
adding specific mkfs options for it and zeroing part of the device.

Switch to skipping it earlier in a more obvious place.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: David Disseldorp <ddiss@suse.de>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Zorro Lang <zlang@kernel.org>

diff --git a/tests/generic/740 b/tests/generic/740
index 6a97ac69a642d03a3c95a523e3f2f94f4ca183d6..bac927227d10cd54fd79df6bbffb9885d8581f7c 100755 (executable)
--- a/tests/generic/740
+++ b/tests/generic/740
@@ -46,8 +46,8 @@ do
                preargs="-p lock_nolock -j 1"
                ;;
        jffs2)
-               # jffs2 mkfs requires '-r $directory' and '-o $image'
-               preargs="-r /proc/fs -o"
+               # mkfs.jffs2 doesn't work like a normal mkfs and just fails
+               continue;
                ;;
        jfs)
                preop="echo Y |"
@@ -79,8 +79,6 @@ do
 
        if [ $? -eq 0 ] ; then
                # next, ensure we don't overwrite it
-               # jffs2 mkfs doesn't check overwrite case
-               [ $fs = jffs2 ] && continue
 
                echo "=== Attempting $FSTYP overwrite of $fs..." >>$seqres.full
                ${MKFS_PROG} -t $FSTYP $SCRATCH_DEV >>$seqres.full 2>&1