support reiser4 mounts (even though reiser4 appears to be broken)

diff --git a/README b/README
index 9b41a6e7f1a85613085bb17992ae6016ca4b19f3..7b37d1f7e2da98b0846f3cb0568b031dcb9c54ca 100644 (file)
--- a/README
+++ b/README
@@ -1,8 +1,8 @@
                 Unionfs 2.0 Regression Test Suite README
                 ****************************************
 
-Local File Systems Tests (tested with ext2, ext3, ext4, xfs, and reiserfs)
---------------------------------------------------------------------
+Local File Systems Tests (tested with ext2, ext3, ext4, xfs, reiser4, and reiserfs)
+-----------------------------------------------------------------------------------
 
 The current regression suite requires that you define four separate
 local-disk devices, which WILL BE FORMATTED(!) by the regression suite
@@ -57,6 +57,10 @@ other lower-level operation than was expected.  The diff lines will contain
 a file type (e.g., "f" for files or "d" for directories), and then a
 lower-level name that shouldn't appear, or does appear.
 
+Note: reiser4 appears to be broken, so can't test with it.  Tried  reiser4
+for 2.6.21, but right on mount, getting an error:
+
+       BUG: sleeping function called from invalid context at kernel/rwsem.c:20
 
 ##############################################################################
 NFS Tests

diff --git a/brm.conf b/brm.conf
index 392fcd30296ec1bb3b95ee65ff39047d09f5a4ff..720d120e8575e00747f22ce5e4c1b6bcb2727640 100644 (file)
--- a/brm.conf
+++ b/brm.conf
@@ -43,9 +43,9 @@ DEV3=/dev/loop4
 
 # Name of file systems to format your device.  Supported file systems
 # Include the following:
-# 1. Disk based: ext2, ext3, ext4, reiserfs, and xfs.
+# 1. Disk based: ext2, ext3, ext4, reiserfs, reiser4, and xfs.
 # 2. Network: nfs, nfs2, and nfs3 (nfs4 support pending).
-# 3. Special: jffs2, ramfs, and tmpfs.
+# 3. Special: jffs2, ramfs, tmpfs, cramfs, and squashfs.
 case ${MYFS} in
        # jffs2 is special: only the leftmost filesystem uses it
        jffs* | ramfs | tmpfs )

diff --git a/default.conf b/default.conf
index b7725ad0b2c78adb831e61ff12051c892e7a716e..366ec315264468723cc49360c8e1d53a10208526 100644 (file)
--- a/default.conf
+++ b/default.conf
@@ -45,9 +45,9 @@ DEV3=/dev/loop3
 
 # Name of file systems to format your device.  Supported file systems
 # Include the following:
-# 1. Disk based: ext2, ext3, ext4, reiserfs, and xfs.
+# 1. Disk based: ext2, ext3, ext4, reiserfs, reiser4, and xfs.
 # 2. Network: nfs, nfs2, and nfs3 (nfs4 support pending).
-# 3. Special: jffs2, ramfs, and tmpfs.
+# 3. Special: jffs2, ramfs, tmpfs, cramfs, and squashfs.
 case ${MYFS} in
        # jffs2 is special: only the leftmost filesystem uses it
        jffs* | ramfs | tmpfs )

diff --git a/run-tests b/run-tests
index d9f7f1863ecadc9b3eb78a53e968a96fdc615e7f..02723b5f6144629c338b02ffa07ed03ffd3183d7 100755 (executable)
--- a/run-tests
+++ b/run-tests
@@ -129,6 +129,11 @@ function setup_lower
                runcmd mkdir -p /n/lower/b$i
                runcmd mount -t $fs $dev /n/lower/b$i
                ;;
+           reiser4 )
+               runcmd mkfs.reiser4 -y $dev
+               runcmd mkdir -p /n/lower/b$i
+               runcmd mount -t $fs $dev /n/lower/b$i
+               ;;
            ext4 )
                # ext4 is in development.  Use ext3 f/s format for now.
                runcmd mkfs -t ext3 -q $dev

diff --git a/thor.conf b/thor.conf
index d0578bad85f59ffba2c368d2fcd44316606f7ca1..af52ba07141f4b92b76ac0f5816dd7b7b5918e72 100644 (file)
--- a/thor.conf
+++ b/thor.conf
@@ -44,9 +44,9 @@ DEV3=/dev/.static/dev/loop3
 
 # Name of file systems to format your device.  Supported file systems
 # Include the following:
-# 1. Disk based: ext2, ext3, ext4, reiserfs, and xfs.
+# 1. Disk based: ext2, ext3, ext4, reiserfs, reiser4, and xfs.
 # 2. Network: nfs, nfs2, and nfs3 (nfs4 support pending).
-# 3. Special: jffs2, ramfs, and tmpfs.
+# 3. Special: jffs2, ramfs, tmpfs, cramfs, and squashfs.
 case ${MYFS} in
        # jffs2 is special: only the leftmost filesystem uses it
        jffs* | ramfs | tmpfs )