common/rc: refactor _require_{ext2,tmpfs} helpers

Combine these two helpers into a single generic function so that we can
use it in the next patch to test a regression when running overlayfs
atop xfs.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Eryu Guan <guaneryu@gmail.com>
Signed-off-by: Eryu Guan <guaneryu@gmail.com>

common/rc

@@ -1766,26 +1766,13 @@ _require_loop()
     fi
 }
 
-# this test requires ext2 filesystem support
+# this test requires kernel support for a secondary filesystem
 #
-_require_ext2()
+_require_extra_fs()
 {
-    modprobe ext2 >/dev/null 2>&1
-    if grep ext2 /proc/filesystems >/dev/null 2>&1
-    then
-	:
-    else
-	_notrun "This test requires ext2 filesystem support"
-    fi
-}
-
-# this test requires tmpfs filesystem support
-#
-_require_tmpfs()
-{
-	modprobe tmpfs >/dev/null 2>&1
-	grep -q tmpfs /proc/filesystems ||
-		_notrun "this test requires tmpfs support"
+	modprobe "$1" >/dev/null 2>&1
+	grep -q -w "$1" /proc/filesystems ||
+		_notrun "this test requires $1 support"
 }
 
 # this test requires that (large) loopback device files are not in use

tests/overlay/025

@@ -42,7 +42,7 @@ rm -f $seqres.full
 # Modify as appropriate.
 _supported_fs overlay
 _require_user
-_require_tmpfs
+_require_extra_fs tmpfs
 
 # create a tmpfs in $TEST_DIR
 tmpfsdir=$TEST_DIR/tmpfs

tests/overlay/106

@@ -27,7 +27,7 @@ rm -f $seqres.full
 # real QA test starts here
 
 _supported_fs overlay
-_require_tmpfs
+_require_extra_fs tmpfs
 _require_test
 _require_scratch
 _require_unionmount_testsuite

tests/overlay/107

@@ -27,7 +27,7 @@ rm -f $seqres.full
 # real QA test starts here
 
 _supported_fs overlay
-_require_tmpfs
+_require_extra_fs tmpfs
 _require_test
 _require_scratch
 _require_unionmount_testsuite

tests/overlay/108

@@ -27,7 +27,7 @@ rm -f $seqres.full
 # real QA test starts here
 
 _supported_fs overlay
-_require_tmpfs
+_require_extra_fs tmpfs
 _require_test
 _require_scratch
 _require_unionmount_testsuite

tests/overlay/109

@@ -27,7 +27,7 @@ rm -f $seqres.full
 # real QA test starts here
 
 _supported_fs overlay
-_require_tmpfs
+_require_extra_fs tmpfs
 _require_test
 _require_scratch
 _require_unionmount_testsuite

tests/xfs/049

@@ -46,7 +46,7 @@ _require_nonexternal
 _require_scratch_nocheck
 _require_no_large_scratch_dev
 _require_loop
-_require_ext2
+_require_extra_fs ext2
 
 rm -f $seqres.full