From 95cc46689b26785088040460e073cada015359d1 Mon Sep 17 00:00:00 2001 From: Erez_Zadok Date: Fri, 13 Jul 2007 18:54:08 -0400 Subject: [PATCH] support reiser4 mounts (even though reiser4 appears to be broken) --- README | 8 ++++++-- brm.conf | 4 ++-- default.conf | 4 ++-- run-tests | 5 +++++ thor.conf | 4 ++-- 5 files changed, 17 insertions(+), 8 deletions(-) diff --git a/README b/README index 9b41a6e..7b37d1f 100644 --- 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 392fcd3..720d120 100644 --- 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 b7725ad..366ec31 100644 --- 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 d9f7f18..02723b5 100755 --- 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 d0578ba..af52ba0 100644 --- 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 ) -- 2.34.1