From: Dave Chinner <dchinner@redhat.com>
Date: Fri, 15 Mar 2013 12:28:04 +0000 (+0000)
Subject: xfstests: introduce a common directory
X-Git-Tag: v2022.05.01~3475
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=8c4905a42e10650a75c0e3966ecc044e1a9616d0;p=users%2Fhch%2Fxfstests-dev.git

xfstests: introduce a common directory

Introduce a top level common directory and move all the common.*
files into it.  Because there is now a directory named common, the
prefix can be dropped from all the files. Convert all the tests to
use this new directory for including common files.

for f in common.*; do \
	git mv `echo -n "$f " ; echo $f | sed -e 's;n\.;n/;'` \
done

Signed-off-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Phil White <pwhite@sgi.com>
[rjohnston@sgi.com reworked for TOT changes]
Signed-off-by: Rich Johnston <rjohnston@sgi.com>
---

diff --git a/check b/check
index af6d3172e..cc426db0b 100755
--- a/check
+++ b/check
@@ -133,9 +133,9 @@ fi
 export FSTYP
 
 # we need common.config
-if ! . ./common.config
+if ! . ./common/config
 then
-    echo "$iam: failed to source common.config"
+    echo "$iam: failed to source common/config"
     exit 1
 fi
 
@@ -266,10 +266,10 @@ then
     list=`echo $list | awk -f randomize.awk`
 fi
 
-# we need common.rc
-if ! . ./common.rc
+# we need common/rc
+if ! . ./common/rc
 then
-    echo "check: failed to source common.rc"
+    echo "check: failed to source common/rc"
     exit 1
 fi
 
diff --git a/common.attr b/common/attr
similarity index 100%
rename from common.attr
rename to common/attr
diff --git a/common.config b/common/config
similarity index 100%
rename from common.config
rename to common/config
diff --git a/common.defrag b/common/defrag
similarity index 100%
rename from common.defrag
rename to common/defrag
diff --git a/common.dmapi b/common/dmapi
similarity index 100%
rename from common.dmapi
rename to common/dmapi
diff --git a/common.dump b/common/dump
similarity index 100%
rename from common.dump
rename to common/dump
diff --git a/common.filestreams b/common/filestreams
similarity index 100%
rename from common.filestreams
rename to common/filestreams
diff --git a/common.filter b/common/filter
similarity index 100%
rename from common.filter
rename to common/filter
diff --git a/common.filter.btrfs b/common/filter.btrfs
similarity index 100%
rename from common.filter.btrfs
rename to common/filter.btrfs
diff --git a/common.log b/common/log
similarity index 100%
rename from common.log
rename to common/log
diff --git a/common.punch b/common/punch
similarity index 99%
rename from common.punch
rename to common/punch
index 733729816..cfbe5769b 100644
--- a/common.punch
+++ b/common/punch
@@ -19,7 +19,7 @@
 # common functions for excersizing hole punches with extent size hints etc.
 
 # source dmap_scratch_mount etc.
-. ./common.dmapi
+. ./common/dmapi
 
 _spawn_test_file() {
 	echo "# spawning test file with $*"
diff --git a/common.quota b/common/quota
similarity index 100%
rename from common.quota
rename to common/quota
diff --git a/common.rc b/common/rc
similarity index 99%
rename from common.rc
rename to common/rc
index e3ea7dd63..44469e999 100644
--- a/common.rc
+++ b/common/rc
@@ -154,7 +154,7 @@ _fsck_opts()
 # we need common.config
 if [ "$iam" != "check" ]
 then
-    if ! . ./common.config
+    if ! . ./common/config
         then
         echo "$iam: failed to source common.config"
         exit 1
diff --git a/common.repair b/common/repair
similarity index 100%
rename from common.repair
rename to common/repair
diff --git a/common.scsi_debug b/common/scsi_debug
similarity index 100%
rename from common.scsi_debug
rename to common/scsi_debug
diff --git a/tests/btrfs/254 b/tests/btrfs/254
index d81f211d7..4a3336c0c 100755
--- a/tests/btrfs/254
+++ b/tests/btrfs/254
@@ -41,8 +41,8 @@ _cleanup()
 trap "_cleanup ; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs btrfs
diff --git a/tests/btrfs/264 b/tests/btrfs/264
index ae10fea70..ed084035c 100755
--- a/tests/btrfs/264
+++ b/tests/btrfs/264
@@ -41,8 +41,8 @@ _cleanup()
 trap "_cleanup ; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 _need_to_be_root
 _supported_fs btrfs
diff --git a/tests/btrfs/265 b/tests/btrfs/265
index 04050d86c..f78ed2447 100755
--- a/tests/btrfs/265
+++ b/tests/btrfs/265
@@ -45,8 +45,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 _need_to_be_root
 _supported_fs btrfs
diff --git a/tests/btrfs/276 b/tests/btrfs/276
index 2787009d8..a4d3867b0 100755
--- a/tests/btrfs/276
+++ b/tests/btrfs/276
@@ -52,8 +52,8 @@ _cleanup()
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _need_to_be_root
diff --git a/tests/btrfs/284 b/tests/btrfs/284
index e57371c1c..9c260b215 100644
--- a/tests/btrfs/284
+++ b/tests/btrfs/284
@@ -127,9 +127,9 @@ _rundefrag()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.defrag
+. ./common/rc
+. ./common/filter
+. ./common/defrag
 
 # real QA test starts here
 _supported_fs btrfs
diff --git a/tests/btrfs/307 b/tests/btrfs/307
index f84ea90c7..46b5ba397 100644
--- a/tests/btrfs/307
+++ b/tests/btrfs/307
@@ -41,8 +41,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./btrfs.filter
+. ./common/rc
+. ./common/filter.btrfs
 
 # real QA test starts here
 
diff --git a/tests/ext4/271 b/tests/ext4/271
index 372c56b83..dc3794f0d 100755
--- a/tests/ext4/271
+++ b/tests/ext4/271
@@ -34,8 +34,8 @@ status=1	# failure is the default!
 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs ext4
diff --git a/tests/ext4/301 b/tests/ext4/301
index 847a2f035..570bd9d67 100644
--- a/tests/ext4/301
+++ b/tests/ext4/301
@@ -34,9 +34,9 @@ status=1	# failure is the default!
 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.defrag
+. ./common/rc
+. ./common/filter
+. ./common/defrag
 
 # real QA test starts here
 _supported_os Linux
diff --git a/tests/ext4/302 b/tests/ext4/302
index d81992817..92f88e837 100644
--- a/tests/ext4/302
+++ b/tests/ext4/302
@@ -35,9 +35,9 @@ status=1	# failure is the default!
 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.defrag
+. ./common/rc
+. ./common/filter
+. ./common/defrag
 
 # real QA test starts here
 _supported_os Linux
diff --git a/tests/ext4/303 b/tests/ext4/303
index 62947c6f3..382868124 100644
--- a/tests/ext4/303
+++ b/tests/ext4/303
@@ -35,9 +35,9 @@ status=1	# failure is the default!
 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.defrag
+. ./common/rc
+. ./common/filter
+. ./common/defrag
 
 # real QA test starts here
 _supported_os Linux
diff --git a/tests/ext4/304 b/tests/ext4/304
index 24b01025d..304c5163c 100644
--- a/tests/ext4/304
+++ b/tests/ext4/304
@@ -36,9 +36,9 @@ status=1	# failure is the default!
 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.defrag
+. ./common/rc
+. ./common/filter
+. ./common/defrag
 
 # real QA test starts here
 _supported_os Linux
diff --git a/tests/generic/001 b/tests/generic/001
index 4e8b11441..c7d9e5fa4 100755
--- a/tests/generic/001
+++ b/tests/generic/001
@@ -38,8 +38,8 @@ seqres=$RESULT_DIR/$seq
 echo "QA output created by $seq"
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 tmp=/tmp/$$
 here=`pwd`
diff --git a/tests/generic/002 b/tests/generic/002
index b9fd88865..19b6871e5 100755
--- a/tests/generic/002
+++ b/tests/generic/002
@@ -29,8 +29,8 @@ seqres=$RESULT_DIR/$seq
 echo "QA output created by $seq"
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 tmp=/tmp/$$
 here=`pwd`
diff --git a/tests/generic/005 b/tests/generic/005
index 42c4f0be6..8bfb94f99 100755
--- a/tests/generic/005
+++ b/tests/generic/005
@@ -64,8 +64,8 @@ _touch()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs generic
diff --git a/tests/generic/006 b/tests/generic/006
index 252ed5bf9..e12234c6b 100755
--- a/tests/generic/006
+++ b/tests/generic/006
@@ -51,8 +51,8 @@ _count()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs generic
diff --git a/tests/generic/007 b/tests/generic/007
index bc9148e24..e72ddd1b2 100755
--- a/tests/generic/007
+++ b/tests/generic/007
@@ -45,8 +45,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs generic
diff --git a/tests/generic/010 b/tests/generic/010
index 18f2eaa35..61f7a3ce9 100755
--- a/tests/generic/010
+++ b/tests/generic/010
@@ -51,8 +51,8 @@ _filter_dbtest()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 [ -x $here/src/dbtest ] || _notrun "dbtest was not built for this platform"
 
diff --git a/tests/generic/011 b/tests/generic/011
index 731500fa7..42c5f62d2 100755
--- a/tests/generic/011
+++ b/tests/generic/011
@@ -43,8 +43,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs generic
diff --git a/tests/generic/013 b/tests/generic/013
index 641a9dc7c..71caa2f61 100755
--- a/tests/generic/013
+++ b/tests/generic/013
@@ -53,8 +53,8 @@ _filesize()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 _do_test()
 {
diff --git a/tests/generic/014 b/tests/generic/014
index 8205efcff..21b6e16a2 100755
--- a/tests/generic/014
+++ b/tests/generic/014
@@ -42,8 +42,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 _supported_fs generic
 _supported_os IRIX Linux
diff --git a/tests/generic/015 b/tests/generic/015
index b87144f31..44e5d99f0 100755
--- a/tests/generic/015
+++ b/tests/generic/015
@@ -33,8 +33,8 @@ tmp=/tmp/$$
 status=1	# success is the default!
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 _cleanup()
 {
diff --git a/tests/generic/020 b/tests/generic/020
index 94695eb02..604e73b45 100755
--- a/tests/generic/020
+++ b/tests/generic/020
@@ -34,9 +34,9 @@ status=0	# success is the default!
 trap "_cleanup; rm -f $tmp.* $testfile; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.attr
+. ./common/rc
+. ./common/filter
+. ./common/attr
 
 _cleanup()
 {
diff --git a/tests/generic/053 b/tests/generic/053
index f5daddd57..b238e304b 100755
--- a/tests/generic/053
+++ b/tests/generic/053
@@ -34,9 +34,9 @@ status=1	# failure is the default!
 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.attr
+. ./common/rc
+. ./common/filter
+. ./common/attr
 
 # real QA test starts here
 _supported_fs generic
diff --git a/tests/generic/062 b/tests/generic/062
index dde4baf7d..3826c179f 100755
--- a/tests/generic/062
+++ b/tests/generic/062
@@ -34,9 +34,9 @@ tmp=/tmp/$$
 status=1	# failure is the default!
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.attr
+. ./common/rc
+. ./common/filter
+. ./common/attr
 
 _cleanup()
 {
diff --git a/tests/generic/068 b/tests/generic/068
index 1a531a396..cd37c6c98 100755
--- a/tests/generic/068
+++ b/tests/generic/068
@@ -48,8 +48,8 @@ trap "_cleanup" 0 1 2 3 15
 
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs generic
diff --git a/tests/generic/069 b/tests/generic/069
index f16bdc8e7..6924b7e56 100755
--- a/tests/generic/069
+++ b/tests/generic/069
@@ -34,8 +34,8 @@ status=0	# success is the default!
 trap "rm -rf $tmp.*; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs generic
diff --git a/tests/generic/070 b/tests/generic/070
index 120c4d96f..eece69fd4 100755
--- a/tests/generic/070
+++ b/tests/generic/070
@@ -41,9 +41,9 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.attr
+. ./common/rc
+. ./common/filter
+. ./common/attr
 
 # real QA test starts here
 _supported_fs generic
diff --git a/tests/generic/074 b/tests/generic/074
index ce6cc202f..dd0497fbf 100755
--- a/tests/generic/074
+++ b/tests/generic/074
@@ -41,8 +41,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 _do_test()
 {
diff --git a/tests/generic/075 b/tests/generic/075
index 7d7a211f6..2d3d3ea85 100755
--- a/tests/generic/075
+++ b/tests/generic/075
@@ -41,8 +41,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 _do_test()
 {
diff --git a/tests/generic/076 b/tests/generic/076
index ed012e790..31ca347bc 100755
--- a/tests/generic/076
+++ b/tests/generic/076
@@ -50,8 +50,8 @@ _cleanup()
 trap "_cleanup; rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs generic
diff --git a/tests/generic/077 b/tests/generic/077
index f7f1eb8db..87c318054 100755
--- a/tests/generic/077
+++ b/tests/generic/077
@@ -43,9 +43,9 @@ _cleanup()
 trap "_cleanup; rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.attr
+. ./common/rc
+. ./common/filter
+. ./common/attr
 
 # real QA test starts here
 _supported_fs generic
diff --git a/tests/generic/079 b/tests/generic/079
index 9700879b0..5763a6313 100755
--- a/tests/generic/079
+++ b/tests/generic/079
@@ -43,9 +43,9 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.attr
+. ./common/rc
+. ./common/filter
+. ./common/attr
 
 _supported_fs generic
 _supported_os Linux
diff --git a/tests/generic/083 b/tests/generic/083
index d7f58f782..1bc70f100 100755
--- a/tests/generic/083
+++ b/tests/generic/083
@@ -51,8 +51,8 @@ _cleanup()
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs generic
diff --git a/tests/generic/088 b/tests/generic/088
index 9d0333816..285ec9f68 100755
--- a/tests/generic/088
+++ b/tests/generic/088
@@ -36,8 +36,8 @@ status=1	# failure is the default!
 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 _filter()
 {
diff --git a/tests/generic/089 b/tests/generic/089
index f3e77fe20..83d050d64 100755
--- a/tests/generic/089
+++ b/tests/generic/089
@@ -36,8 +36,8 @@ status=1	# failure is the default!
 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 addentries()
 {
diff --git a/tests/generic/091 b/tests/generic/091
index 41076566b..1ba7858db 100755
--- a/tests/generic/091
+++ b/tests/generic/091
@@ -34,8 +34,8 @@ status=1	# failure is the default!
 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs generic
diff --git a/tests/generic/093 b/tests/generic/093
index 123ea7dc8..bd45d627c 100755
--- a/tests/generic/093
+++ b/tests/generic/093
@@ -37,9 +37,9 @@ status=1	# FAILure is the default!
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.attr
+. ./common/rc
+. ./common/filter
+. ./common/attr
 
 _cleanup()
 {
diff --git a/tests/generic/097 b/tests/generic/097
index 102c558e1..27804f585 100755
--- a/tests/generic/097
+++ b/tests/generic/097
@@ -61,8 +61,8 @@ _umount_and_mount()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # link correct .out file
 # This is done bacause udf and xfs print attrs in different orders.
diff --git a/tests/generic/099 b/tests/generic/099
index 8a21277aa..83ddd9f97 100755
--- a/tests/generic/099
+++ b/tests/generic/099
@@ -35,9 +35,9 @@ status=1	# failure is the default!
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.attr
+. ./common/rc
+. ./common/filter
+. ./common/attr
 
 runas=$here/src/runas
 
diff --git a/tests/generic/100 b/tests/generic/100
index a9d0a76b1..8152fc1eb 100755
--- a/tests/generic/100
+++ b/tests/generic/100
@@ -35,8 +35,8 @@ status=1	# failure is the default!
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 _cleanup()
 {
@@ -47,7 +47,7 @@ _cleanup()
 _supported_fs generic
 _supported_os IRIX Linux
 
-# Use _populate_fs() in common.rc to create a directory structure.
+# Use _populate_fs() in common/rc to create a directory structure.
 TEMP_DIR=/tmp
 [ "$FSTYP" == "xfs" ] && TEMP_DIR=$TEST_DIR
 TAR_FILE=temp.tar
diff --git a/tests/generic/105 b/tests/generic/105
index 09a47df38..69ec933db 100755
--- a/tests/generic/105
+++ b/tests/generic/105
@@ -42,9 +42,9 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.attr
+. ./common/rc
+. ./common/filter
+. ./common/attr
 
 # Modify as appropriate.
 _supported_fs generic
diff --git a/tests/generic/112 b/tests/generic/112
index 6ffefe5fd..e8852ab1e 100755
--- a/tests/generic/112
+++ b/tests/generic/112
@@ -41,8 +41,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 _do_test()
 {
diff --git a/tests/generic/113 b/tests/generic/113
index 4a4bf2041..68322c9aa 100755
--- a/tests/generic/113
+++ b/tests/generic/113
@@ -41,8 +41,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 _do_test()
 {
diff --git a/tests/generic/117 b/tests/generic/117
index 7f8563d8f..8f43e6c69 100755
--- a/tests/generic/117
+++ b/tests/generic/117
@@ -73,9 +73,9 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.attr
+. ./common/rc
+. ./common/filter
+. ./common/attr
 
 # real QA test starts here
 _supported_fs generic
diff --git a/tests/generic/120 b/tests/generic/120
index afc2408f2..ad909d2d4 100755
--- a/tests/generic/120
+++ b/tests/generic/120
@@ -34,8 +34,8 @@ status=1	# failure is the default!
 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs generic
diff --git a/tests/generic/123 b/tests/generic/123
index df0a34704..a7601a338 100755
--- a/tests/generic/123
+++ b/tests/generic/123
@@ -44,8 +44,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs generic
diff --git a/tests/generic/124 b/tests/generic/124
index 7babdd3e0..455b555e8 100755
--- a/tests/generic/124
+++ b/tests/generic/124
@@ -44,8 +44,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs generic
diff --git a/tests/generic/125 b/tests/generic/125
index c606f290d..f818b573c 100755
--- a/tests/generic/125
+++ b/tests/generic/125
@@ -39,8 +39,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs generic
diff --git a/tests/generic/126 b/tests/generic/126
index 5bad7d151..3e1ef6f62 100755
--- a/tests/generic/126
+++ b/tests/generic/126
@@ -40,8 +40,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs generic
diff --git a/tests/generic/127 b/tests/generic/127
index b9098a1d4..bf4539e71 100755
--- a/tests/generic/127
+++ b/tests/generic/127
@@ -44,8 +44,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 FSX_FILE_SIZE=262144
 FSX_ARGS="-q -l $FSX_FILE_SIZE -o 65536 -S 191110531 -N 100000"
diff --git a/tests/generic/128 b/tests/generic/128
index 2cb414c8b..f78fd1794 100755
--- a/tests/generic/128
+++ b/tests/generic/128
@@ -40,8 +40,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs generic
diff --git a/tests/generic/129 b/tests/generic/129
index 9d1440eee..9efb2c785 100755
--- a/tests/generic/129
+++ b/tests/generic/129
@@ -40,8 +40,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 echo_and_run()
 {
diff --git a/tests/generic/130 b/tests/generic/130
index ebdbb7139..5b0a0613f 100755
--- a/tests/generic/130
+++ b/tests/generic/130
@@ -49,8 +49,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs generic
diff --git a/tests/generic/131 b/tests/generic/131
index a2602c21d..66ffc891e 100755
--- a/tests/generic/131
+++ b/tests/generic/131
@@ -41,8 +41,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs generic
diff --git a/tests/generic/132 b/tests/generic/132
index 002b3305b..b855661a3 100755
--- a/tests/generic/132
+++ b/tests/generic/132
@@ -41,8 +41,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs generic
diff --git a/tests/generic/133 b/tests/generic/133
index be6244b87..e1d592993 100755
--- a/tests/generic/133
+++ b/tests/generic/133
@@ -39,8 +39,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs generic
diff --git a/tests/generic/135 b/tests/generic/135
index 3bb05e381..0e5a2e216 100755
--- a/tests/generic/135
+++ b/tests/generic/135
@@ -40,8 +40,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs generic
diff --git a/tests/generic/141 b/tests/generic/141
index 7df988f5c..a91946c36 100755
--- a/tests/generic/141
+++ b/tests/generic/141
@@ -39,8 +39,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs generic
diff --git a/tests/generic/169 b/tests/generic/169
index 99cf5473a..6c7f8d328 100755
--- a/tests/generic/169
+++ b/tests/generic/169
@@ -50,8 +50,8 @@ _show_wrote_and_stat_only()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs generic
diff --git a/tests/generic/184 b/tests/generic/184
index 56efc3c36..d551c117a 100755
--- a/tests/generic/184
+++ b/tests/generic/184
@@ -41,8 +41,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs generic
diff --git a/tests/generic/192 b/tests/generic/192
index 321a92f0d..3247ebd18 100755
--- a/tests/generic/192
+++ b/tests/generic/192
@@ -41,8 +41,8 @@ _access_time()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 
diff --git a/tests/generic/193 b/tests/generic/193
index 48deac713..da61a18d1 100755
--- a/tests/generic/193
+++ b/tests/generic/193
@@ -60,8 +60,8 @@ _cleanup_files()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs generic
diff --git a/tests/generic/198 b/tests/generic/198
index b2d4cbafe..f683ff1ed 100755
--- a/tests/generic/198
+++ b/tests/generic/198
@@ -40,8 +40,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 _supported_fs generic
 _supported_os Linux
diff --git a/tests/generic/204 b/tests/generic/204
index baf45ef65..37cb427d2 100755
--- a/tests/generic/204
+++ b/tests/generic/204
@@ -32,8 +32,8 @@ tmp=/tmp/$$
 status=1	# failure is the default!
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs generic
diff --git a/tests/generic/207 b/tests/generic/207
index faef4a45b..86c81df4c 100755
--- a/tests/generic/207
+++ b/tests/generic/207
@@ -39,8 +39,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 
diff --git a/tests/generic/208 b/tests/generic/208
index 437547c4f..fd9b6d9db 100755
--- a/tests/generic/208
+++ b/tests/generic/208
@@ -39,8 +39,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 
diff --git a/tests/generic/209 b/tests/generic/209
index dc9c47e9e..08be54698 100755
--- a/tests/generic/209
+++ b/tests/generic/209
@@ -39,8 +39,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 
diff --git a/tests/generic/210 b/tests/generic/210
index f4f997a70..e85fd48a1 100755
--- a/tests/generic/210
+++ b/tests/generic/210
@@ -39,8 +39,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 
diff --git a/tests/generic/211 b/tests/generic/211
index 193cd0dab..fa2a60a3f 100755
--- a/tests/generic/211
+++ b/tests/generic/211
@@ -39,8 +39,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 
diff --git a/tests/generic/212 b/tests/generic/212
index 2f46c09a1..94e25888d 100755
--- a/tests/generic/212
+++ b/tests/generic/212
@@ -40,8 +40,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 
diff --git a/tests/generic/213 b/tests/generic/213
index 40829c3ff..c3adba0a7 100755
--- a/tests/generic/213
+++ b/tests/generic/213
@@ -43,8 +43,8 @@ status=1	# failure is the default!
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 # generic, but xfs_io's fallocate must work
diff --git a/tests/generic/214 b/tests/generic/214
index d26d0774a..e1dcc6f2b 100755
--- a/tests/generic/214
+++ b/tests/generic/214
@@ -41,8 +41,8 @@ status=1	# failure is the default!
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 # generic, but xfs_io's fallocate must work
diff --git a/tests/generic/215 b/tests/generic/215
index f03af0df2..6894f8351 100755
--- a/tests/generic/215
+++ b/tests/generic/215
@@ -41,8 +41,8 @@ status=1	# failure is the default!
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs generic
diff --git a/tests/generic/219 b/tests/generic/219
index d94209861..22d3c0407 100755
--- a/tests/generic/219
+++ b/tests/generic/219
@@ -37,9 +37,9 @@ status=1	# failure is the default!
 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.quota
+. ./common/rc
+. ./common/filter
+. ./common/quota
 
 # real QA test starts here
 _supported_fs generic
diff --git a/tests/generic/221 b/tests/generic/221
index f554fe3a6..8f142f244 100755
--- a/tests/generic/221
+++ b/tests/generic/221
@@ -36,7 +36,7 @@ tmp=/tmp/$$
 status=1	# failure is the default!
 
 # get standard environment, filters and checks
-. ./common.rc
+. ./common/rc
 
 # real QA test starts here
 _supported_fs generic
diff --git a/tests/generic/223 b/tests/generic/223
index 8c8338730..aca9c3df1 100755
--- a/tests/generic/223
+++ b/tests/generic/223
@@ -40,8 +40,8 @@ _cleanup()
 trap "_cleanup ; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs generic
diff --git a/tests/generic/224 b/tests/generic/224
index c59b6b9ed..ef9704f00 100755
--- a/tests/generic/224
+++ b/tests/generic/224
@@ -46,8 +46,8 @@ _cleanup()
 trap "_cleanup ; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs generic
diff --git a/tests/generic/225 b/tests/generic/225
index 31d02040c..47b0fcd68 100755
--- a/tests/generic/225
+++ b/tests/generic/225
@@ -40,8 +40,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs generic
diff --git a/tests/generic/226 b/tests/generic/226
index 5111c9a72..ac5125ae5 100755
--- a/tests/generic/226
+++ b/tests/generic/226
@@ -34,7 +34,7 @@ status=1	# failure is the default!
 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
+. ./common/rc
 
 _supported_fs generic
 _supported_os Linux IRIX
diff --git a/tests/generic/228 b/tests/generic/228
index f58982df2..0bf0f0fe5 100755
--- a/tests/generic/228
+++ b/tests/generic/228
@@ -42,7 +42,7 @@ status=1	# failure is the default!
 trap "_cleanup; exit \$status" 0 1 2 3 15 25
 
 # get standard environment, filters and checks
-. ./common.rc
+. ./common/rc
 
 # real QA test starts here
 # generic, but xfs_io's fallocate must work
diff --git a/tests/generic/230 b/tests/generic/230
index 005af429b..b02e8e968 100755
--- a/tests/generic/230
+++ b/tests/generic/230
@@ -37,9 +37,9 @@ status=1	# failure is the default!
 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.quota
+. ./common/rc
+. ./common/filter
+. ./common/quota
 
 # real QA test starts here
 _supported_fs generic
diff --git a/tests/generic/231 b/tests/generic/231
index 2719ad74c..73de5071d 100755
--- a/tests/generic/231
+++ b/tests/generic/231
@@ -35,9 +35,9 @@ status=1	# failure is the default!
 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.quota
+. ./common/rc
+. ./common/filter
+. ./common/quota
 
 FSX_FILE_SIZE=64000000
 FSX_ARGS="-q -l $FSX_FILE_SIZE -o 65536 -N 20000"
diff --git a/tests/generic/232 b/tests/generic/232
index 53e023fcc..ca363769e 100755
--- a/tests/generic/232
+++ b/tests/generic/232
@@ -35,9 +35,9 @@ status=1	# failure is the default!
 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.quota
+. ./common/rc
+. ./common/filter
+. ./common/quota
 
 _filter_num()
 {
diff --git a/tests/generic/233 b/tests/generic/233
index 40b3f5d69..21748a669 100755
--- a/tests/generic/233
+++ b/tests/generic/233
@@ -36,9 +36,9 @@ status=1	# failure is the default!
 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.quota
+. ./common/rc
+. ./common/filter
+. ./common/quota
 
 FSX_FILE_SIZE=64000000
 FSX_ARGS="-q -l $FSX_FILE_SIZE -o 65536 -S 191110531 -N 100000"
diff --git a/tests/generic/234 b/tests/generic/234
index 8bd19e40b..e9184327c 100755
--- a/tests/generic/234
+++ b/tests/generic/234
@@ -37,9 +37,9 @@ status=1	# failure is the default!
 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.quota
+. ./common/rc
+. ./common/filter
+. ./common/quota
 
 test_setting()
 {
diff --git a/tests/generic/235 b/tests/generic/235
index 5560fa6dc..e52281034 100755
--- a/tests/generic/235
+++ b/tests/generic/235
@@ -37,9 +37,9 @@ status=1	# failure is the default!
 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.quota
+. ./common/rc
+. ./common/filter
+. ./common/quota
 
 # real QA test starts here
 _supported_fs generic
diff --git a/tests/generic/236 b/tests/generic/236
index 831afc744..ecc87865f 100755
--- a/tests/generic/236
+++ b/tests/generic/236
@@ -39,7 +39,7 @@ status=1	# failure is the default!
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
+. ./common/rc
 
 # real QA test starts here
 _supported_fs generic
diff --git a/tests/generic/237 b/tests/generic/237
index 171d96c92..bd0ecf0f1 100755
--- a/tests/generic/237
+++ b/tests/generic/237
@@ -36,9 +36,9 @@ status=1        # FAILure is the default!
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.attr
+. ./common/rc
+. ./common/filter
+. ./common/attr
 
 _cleanup()
 {
diff --git a/tests/generic/239 b/tests/generic/239
index aae4f7ece..df8a02cd8 100755
--- a/tests/generic/239
+++ b/tests/generic/239
@@ -40,8 +40,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 _supported_fs generic
 _supported_os Linux
diff --git a/tests/generic/240 b/tests/generic/240
index 9b6982f04..55e795f99 100755
--- a/tests/generic/240
+++ b/tests/generic/240
@@ -46,8 +46,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 _supported_fs generic
 _supported_os Linux
diff --git a/tests/generic/241 b/tests/generic/241
index 297ae0209..3dbd9d143 100755
--- a/tests/generic/241
+++ b/tests/generic/241
@@ -39,8 +39,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 _supported_fs generic
 _supported_os Linux
diff --git a/tests/generic/245 b/tests/generic/245
index ec81c4ce7..e82fbb9f5 100755
--- a/tests/generic/245
+++ b/tests/generic/245
@@ -35,8 +35,8 @@ tmp=/tmp/$$
 status=1	# failure is the default!
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs generic
diff --git a/tests/generic/246 b/tests/generic/246
index 68c8c27f7..ed2a080dd 100755
--- a/tests/generic/246
+++ b/tests/generic/246
@@ -36,8 +36,8 @@ tmp=/tmp/$$
 status=1	# failure is the default!
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs generic
diff --git a/tests/generic/247 b/tests/generic/247
index 31b94a9c1..227b0c0ab 100755
--- a/tests/generic/247
+++ b/tests/generic/247
@@ -40,8 +40,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 
diff --git a/tests/generic/248 b/tests/generic/248
index 3f68146c9..7ae04814f 100755
--- a/tests/generic/248
+++ b/tests/generic/248
@@ -40,8 +40,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 
diff --git a/tests/generic/249 b/tests/generic/249
index 32f82e359..0319ef849 100755
--- a/tests/generic/249
+++ b/tests/generic/249
@@ -41,8 +41,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs generic
diff --git a/tests/generic/251 b/tests/generic/251
index c91e67f79..895367b5f 100755
--- a/tests/generic/251
+++ b/tests/generic/251
@@ -39,8 +39,8 @@ chpid=0
 mypid=$$
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs generic
diff --git a/tests/generic/255 b/tests/generic/255
index 181f87e78..0c5993469 100755
--- a/tests/generic/255
+++ b/tests/generic/255
@@ -40,9 +40,9 @@ _cleanup()
 trap "_cleanup ; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.punch
+. ./common/rc
+. ./common/filter
+. ./common/punch
 
 # real QA test starts here
 _supported_fs generic 
diff --git a/tests/generic/256 b/tests/generic/256
index 384bd3c19..bc5c3241c 100755
--- a/tests/generic/256
+++ b/tests/generic/256
@@ -40,9 +40,9 @@ _cleanup()
 trap "_cleanup ; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.punch
+. ./common/rc
+. ./common/filter
+. ./common/punch
 
 # real QA test starts here
 _supported_fs generic
diff --git a/tests/generic/257 b/tests/generic/257
index d341063cf..e12fed8db 100755
--- a/tests/generic/257
+++ b/tests/generic/257
@@ -38,8 +38,8 @@ _cleanup()
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs generic
diff --git a/tests/generic/258 b/tests/generic/258
index b8fe984e7..186857037 100755
--- a/tests/generic/258
+++ b/tests/generic/258
@@ -42,7 +42,7 @@ _cleanup()
 trap "_cleanup ; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
+. ./common/rc
 
 # real QA test starts here
 _supported_fs generic
diff --git a/tests/generic/260 b/tests/generic/260
index e51412837..425cf86fc 100755
--- a/tests/generic/260
+++ b/tests/generic/260
@@ -36,8 +36,8 @@ chpid=0
 mypid=$$
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs generic
diff --git a/tests/generic/263 b/tests/generic/263
index 56f4ae39f..c8af9f4da 100755
--- a/tests/generic/263
+++ b/tests/generic/263
@@ -34,8 +34,8 @@ status=1	# failure is the default!
 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs generic
diff --git a/tests/generic/269 b/tests/generic/269
index 7b387b2d1..47f5b2a76 100755
--- a/tests/generic/269
+++ b/tests/generic/269
@@ -34,8 +34,8 @@ status=1	# failure is the default!
 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 # Disable all sync operations to get higher load
 FSSTRESS_AVOID="$FSSTRESS_AVOID -ffsync=0 -fsync=0 -ffdatasync=0"
 _workout()
diff --git a/tests/generic/270 b/tests/generic/270
index 8ca8aa2ab..d7d9e3099 100755
--- a/tests/generic/270
+++ b/tests/generic/270
@@ -35,9 +35,9 @@ status=1	# failure is the default!
 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.quota
+. ./common/rc
+. ./common/filter
+. ./common/quota
 
 # Disable all sync operations to get higher load
 FSSTRESS_AVOID="$FSSTRESS_AVOID -ffsync=0 -fsync=0 -ffdatasync=0"
diff --git a/tests/generic/273 b/tests/generic/273
index 63e64b158..9b79a7106 100755
--- a/tests/generic/273
+++ b/tests/generic/273
@@ -41,8 +41,8 @@ _cleanup()
 	_scratch_unmount
 }
 
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 threads=50
 count=2
diff --git a/tests/generic/274 b/tests/generic/274
index 00f869df6..022b0c4ad 100755
--- a/tests/generic/274
+++ b/tests/generic/274
@@ -43,8 +43,8 @@ _cleanup()
 	_scratch_unmount
 }
 
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs generic
diff --git a/tests/generic/275 b/tests/generic/275
index 2d726fadc..b280217d1 100755
--- a/tests/generic/275
+++ b/tests/generic/275
@@ -41,8 +41,8 @@ _cleanup()
 	_scratch_unmount
 }
 
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs generic
diff --git a/tests/generic/277 b/tests/generic/277
index 2118104d6..4e8c025d6 100755
--- a/tests/generic/277
+++ b/tests/generic/277
@@ -38,8 +38,8 @@ _cleanup()
 trap "_cleanup ; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs generic
diff --git a/tests/generic/280 b/tests/generic/280
index 27d5a20f5..e804e6dc7 100755
--- a/tests/generic/280
+++ b/tests/generic/280
@@ -40,9 +40,9 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.quota
+. ./common/rc
+. ./common/filter
+. ./common/quota
 
 _require_scratch
 _require_quota
diff --git a/tests/generic/285 b/tests/generic/285
index 71bd688b0..fab6bf454 100644
--- a/tests/generic/285
+++ b/tests/generic/285
@@ -36,8 +36,8 @@ status=1	# failure is the default!
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 _supported_fs generic
 _supported_os Linux
diff --git a/tests/generic/286 b/tests/generic/286
index d2acd0fa5..70728eaee 100644
--- a/tests/generic/286
+++ b/tests/generic/286
@@ -33,8 +33,8 @@ status=1	# failure is the default!
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs generic
diff --git a/tests/generic/288 b/tests/generic/288
index b8bea8762..6ca0ca783 100644
--- a/tests/generic/288
+++ b/tests/generic/288
@@ -32,8 +32,8 @@ status=0
 trap "exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs generic
diff --git a/tests/generic/294 b/tests/generic/294
index 618e8a404..9a5ff13ba 100644
--- a/tests/generic/294
+++ b/tests/generic/294
@@ -40,8 +40,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 
diff --git a/tests/generic/299 b/tests/generic/299
index dba92129d..71a119193 100644
--- a/tests/generic/299
+++ b/tests/generic/299
@@ -36,8 +36,8 @@ status=1	# failure is the default!
 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs generic
diff --git a/tests/generic/300 b/tests/generic/300
index efd7ec840..4612dc284 100644
--- a/tests/generic/300
+++ b/tests/generic/300
@@ -36,8 +36,8 @@ status=1	# failure is the default!
 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs generic
diff --git a/tests/generic/306 b/tests/generic/306
index 72e32caa3..35fb5ef9b 100644
--- a/tests/generic/306
+++ b/tests/generic/306
@@ -37,8 +37,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 
diff --git a/tests/shared/032 b/tests/shared/032
index 1701c77db..7835e30df 100755
--- a/tests/shared/032
+++ b/tests/shared/032
@@ -33,8 +33,8 @@ trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 rm -f $seqres.full
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs xfs btrfs
diff --git a/tests/shared/051 b/tests/shared/051
index f1eb95629..18f308020 100755
--- a/tests/shared/051
+++ b/tests/shared/051
@@ -34,9 +34,9 @@ status=1	# FAILure is the default!
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.attr
+. ./common/rc
+. ./common/filter
+. ./common/attr
 
 _cleanup()
 {
diff --git a/tests/shared/218 b/tests/shared/218
index 6ede97a28..70ece651a 100755
--- a/tests/shared/218
+++ b/tests/shared/218
@@ -40,9 +40,9 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.defrag
+. ./common/rc
+. ./common/filter
+. ./common/defrag
 
 # real QA test starts here
 _supported_fs xfs ext4 btrfs
diff --git a/tests/shared/243 b/tests/shared/243
index 56ffafc45..5b966d090 100755
--- a/tests/shared/243
+++ b/tests/shared/243
@@ -115,8 +115,8 @@ _check_ext4_eof_flag()
 }
 
 # Get standard environment, filters and checks.
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # Prerequisites for the test run.
 _supported_fs ext4 xfs btrfs gfs2
diff --git a/tests/shared/272 b/tests/shared/272
index 3e2fffca4..f4db96342 100755
--- a/tests/shared/272
+++ b/tests/shared/272
@@ -39,8 +39,8 @@ write_opt_list="iflag=noatime conv=notrunc conv=fsync"
 [ $FSTYP = "ext4" ] && write_opt_list="$write_opt_list oflag=direct"
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 _workout()
 {
 	echo "Switch data journalling mode. Silence is golden."
diff --git a/tests/shared/289 b/tests/shared/289
index d3affd271..bee7dcfb3 100755
--- a/tests/shared/289
+++ b/tests/shared/289
@@ -39,8 +39,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 
diff --git a/tests/shared/298 b/tests/shared/298
index 4609f5502..d5c05a823 100644
--- a/tests/shared/298
+++ b/tests/shared/298
@@ -30,8 +30,8 @@ echo "QA output created by $seq"
 status=1	# failure is the default!
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
-. common.config
-. common.rc
+. common/config
+. common/rc
 
 _supported_fs ext4 xfs
 _supported_os Linux
diff --git a/tests/shared/305 b/tests/shared/305
index d9b511074..3beb8a527 100644
--- a/tests/shared/305
+++ b/tests/shared/305
@@ -34,15 +34,15 @@ tmp=/tmp/$$
 status=1	# failure is the default!
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 _supported_fs ext3 ext4 xfs btrfs reiserfs
 _supported_os Linux
 _need_to_be_root
 _require_scratch
 _require_fail_make_request
 
-# TODO: Function are common enough to be moved to common.blkdev
+# TODO: Function are common enough to be moved to common/blkdev
 SCRATCH_REAL_DEV=`readlink -f $SCRATCH_DEV`
 SCRATCH_BDEV=`basename $SCRATCH_REAL_DEV`
 
diff --git a/tests/udf/098 b/tests/udf/098
index 504ed0821..12459a239 100755
--- a/tests/udf/098
+++ b/tests/udf/098
@@ -46,8 +46,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 _db_filter()
 {
diff --git a/tests/udf/101 b/tests/udf/101
index 10694ccb6..a48f955f9 100755
--- a/tests/udf/101
+++ b/tests/udf/101
@@ -40,8 +40,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs udf 
diff --git a/tests/udf/102 b/tests/udf/102
index bd0399c93..36b6c4d3f 100755
--- a/tests/udf/102
+++ b/tests/udf/102
@@ -41,8 +41,8 @@ _cleanup()
     _cleanup_testdir
 }
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs udf 
diff --git a/tests/xfs/003 b/tests/xfs/003
index 1d44b93ce..22def867d 100755
--- a/tests/xfs/003
+++ b/tests/xfs/003
@@ -29,8 +29,8 @@ seqres=$RESULT_DIR/$seq
 echo "QA output created by $seq"
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 tmp=/tmp/$$
 here=`pwd`
diff --git a/tests/xfs/004 b/tests/xfs/004
index 076fc4b80..4999558d6 100755
--- a/tests/xfs/004
+++ b/tests/xfs/004
@@ -56,8 +56,8 @@ _populate_scratch()
 
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs xfs
diff --git a/tests/xfs/008 b/tests/xfs/008
index be3720217..a7733260b 100755
--- a/tests/xfs/008
+++ b/tests/xfs/008
@@ -48,8 +48,8 @@ _filter()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 _do_test()
 {
diff --git a/tests/xfs/009 b/tests/xfs/009
index 7528f345a..2d2c2170a 100755
--- a/tests/xfs/009
+++ b/tests/xfs/009
@@ -73,8 +73,8 @@ _filesize()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs xfs
diff --git a/tests/xfs/012 b/tests/xfs/012
index 8cd0e7dd8..3d5c34627 100755
--- a/tests/xfs/012
+++ b/tests/xfs/012
@@ -47,8 +47,8 @@ _filesize()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 _do_test()
 {
diff --git a/tests/xfs/016 b/tests/xfs/016
index 20ea752ec..18c697d63 100755
--- a/tests/xfs/016
+++ b/tests/xfs/016
@@ -173,8 +173,8 @@ _check_corrupt()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs xfs
diff --git a/tests/xfs/017 b/tests/xfs/017
index 4ab1dc2bc..fd2afbedc 100755
--- a/tests/xfs/017
+++ b/tests/xfs/017
@@ -40,8 +40,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs xfs
diff --git a/tests/xfs/018 b/tests/xfs/018
index 2a4c8f934..d04a4eeb8 100755
--- a/tests/xfs/018
+++ b/tests/xfs/018
@@ -34,9 +34,9 @@ tmp=/tmp/$$
 status=1	# failure is the default!
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.log
+. ./common/rc
+. ./common/filter
+. ./common/log
 
 _cleanup()
 {
diff --git a/tests/xfs/019 b/tests/xfs/019
index 4f5916b12..968306694 100755
--- a/tests/xfs/019
+++ b/tests/xfs/019
@@ -33,8 +33,8 @@ tmp=/tmp/$$
 seqfull="$seqres.full"
 status=1	# failure is the default!
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 _cleanup()
 {
diff --git a/tests/xfs/021 b/tests/xfs/021
index d9fa4f47c..bcd76a40f 100755
--- a/tests/xfs/021
+++ b/tests/xfs/021
@@ -32,9 +32,9 @@ here=`pwd`
 tmp=/tmp/$$
 status=0	# success is the default!
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.attr
+. ./common/rc
+. ./common/filter
+. ./common/attr
 
 _cleanup()
 {
diff --git a/tests/xfs/022 b/tests/xfs/022
index c2406933c..ce3c103bc 100755
--- a/tests/xfs/022
+++ b/tests/xfs/022
@@ -37,8 +37,8 @@ tmp=/tmp/$$
 status=0	# success is the default!
 trap "rm -rf $tmp.*; exit \$status" 0 1 2 3 15
 
-. ./common.rc
-. ./common.dump
+. ./common/rc
+. ./common/dump
 
 # link correct .out file
 _link_out_file $seq.out $seqfull.out
diff --git a/tests/xfs/023 b/tests/xfs/023
index 6410b988e..a1823f135 100755
--- a/tests/xfs/023
+++ b/tests/xfs/023
@@ -36,8 +36,8 @@ status=0	# success is the default!
 trap "rm -rf $tmp.*; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.dump
+. ./common/rc
+. ./common/dump
 
 # link correct .out file
 _link_out_file $seq.out $seqfull.out
diff --git a/tests/xfs/024 b/tests/xfs/024
index ee1339caf..a35491616 100755
--- a/tests/xfs/024
+++ b/tests/xfs/024
@@ -34,8 +34,8 @@ status=0	# success is the default!
 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.dump
+. ./common/rc
+. ./common/dump
 
 # real QA test starts here
 _supported_fs xfs
diff --git a/tests/xfs/025 b/tests/xfs/025
index 5a3b0bc72..17eaa40b0 100755
--- a/tests/xfs/025
+++ b/tests/xfs/025
@@ -34,8 +34,8 @@ status=0	# success is the default!
 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.dump
+. ./common/rc
+. ./common/dump
 
 # real QA test starts here
 _supported_fs xfs
diff --git a/tests/xfs/026 b/tests/xfs/026
index 73feb6b7d..6fa33bd65 100755
--- a/tests/xfs/026
+++ b/tests/xfs/026
@@ -34,8 +34,8 @@ status=0	# success is the default!
 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.dump
+. ./common/rc
+. ./common/dump
 
 # real QA test starts here
 _supported_fs xfs
diff --git a/tests/xfs/027 b/tests/xfs/027
index 71ca7f395..f899b5449 100755
--- a/tests/xfs/027
+++ b/tests/xfs/027
@@ -34,8 +34,8 @@ status=0	# success is the default!
 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.dump
+. ./common/rc
+. ./common/dump
 
 # real QA test starts here
 _supported_fs xfs
diff --git a/tests/xfs/028 b/tests/xfs/028
index acbbcd5a8..50741f3e5 100755
--- a/tests/xfs/028
+++ b/tests/xfs/028
@@ -34,8 +34,8 @@ status=0	# success is the default!
 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.dump
+. ./common/rc
+. ./common/dump
 
 # real QA test starts here
 _supported_fs xfs
diff --git a/tests/xfs/029 b/tests/xfs/029
index 83dddb449..289c91003 100755
--- a/tests/xfs/029
+++ b/tests/xfs/029
@@ -34,8 +34,8 @@ status=1	# failure is the default
 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 _filter_logprint()
 {
diff --git a/tests/xfs/030 b/tests/xfs/030
index df3c2b5a0..7e5b2098e 100755
--- a/tests/xfs/030
+++ b/tests/xfs/030
@@ -43,9 +43,9 @@ _cleanup()
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.repair
+. ./common/rc
+. ./common/filter
+. ./common/repair
 
 # link correct .out file
 _link_out_file $seq.out $seqfull.out
diff --git a/tests/xfs/031 b/tests/xfs/031
index cc2daca1b..decd4bb16 100755
--- a/tests/xfs/031
+++ b/tests/xfs/031
@@ -36,9 +36,9 @@ trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 rm -f $seqres.full
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.repair
-. ./common.filter
+. ./common/rc
+. ./common/repair
+. ./common/filter
 
 # link correct .out file
 _link_out_file $seq.out $seqfull.out
diff --git a/tests/xfs/033 b/tests/xfs/033
index 262d262d1..145805cdb 100755
--- a/tests/xfs/033
+++ b/tests/xfs/033
@@ -43,9 +43,9 @@ _cleanup()
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.repair
+. ./common/rc
+. ./common/filter
+. ./common/repair
 
 # link correct .out file
 _link_out_file $seq.out $seqfull.out
diff --git a/tests/xfs/034 b/tests/xfs/034
index 46e65a01e..e053808ee 100755
--- a/tests/xfs/034
+++ b/tests/xfs/034
@@ -42,8 +42,8 @@ _cleanup()
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs xfs
diff --git a/tests/xfs/035 b/tests/xfs/035
index deb70ede3..64d3ead7a 100755
--- a/tests/xfs/035
+++ b/tests/xfs/035
@@ -35,8 +35,8 @@ status=1	# failure is the default!
 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.dump
+. ./common/rc
+. ./common/dump
 
 # link correct .out file
 _link_out_file $seq.out $seqfull.out
diff --git a/tests/xfs/036 b/tests/xfs/036
index 2ef82a7fd..c639f16dd 100755
--- a/tests/xfs/036
+++ b/tests/xfs/036
@@ -35,8 +35,8 @@ status=1	# failure is the default!
 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.dump
+. ./common/rc
+. ./common/dump
 
 # link correct .out file
 _link_out_file $seq.out $seqfull.out
diff --git a/tests/xfs/037 b/tests/xfs/037
index e2b193a4e..81b8322a0 100755
--- a/tests/xfs/037
+++ b/tests/xfs/037
@@ -34,8 +34,8 @@ status=1	# failure is the default!
 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.dump
+. ./common/rc
+. ./common/dump
 
 # real QA test starts here
 _supported_fs xfs
diff --git a/tests/xfs/038 b/tests/xfs/038
index 217fa6f17..8d7bd7e7c 100755
--- a/tests/xfs/038
+++ b/tests/xfs/038
@@ -34,8 +34,8 @@ status=1	# failure is the default!
 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.dump
+. ./common/rc
+. ./common/dump
 
 # real QA test starts here
 _supported_fs xfs
diff --git a/tests/xfs/039 b/tests/xfs/039
index eb04ff4fb..19e712e3f 100755
--- a/tests/xfs/039
+++ b/tests/xfs/039
@@ -35,8 +35,8 @@ status=1	# failure is the default!
 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.dump
+. ./common/rc
+. ./common/dump
 
 # link correct .out file
 _link_out_file $seq.out $seqfull.out
diff --git a/tests/xfs/040 b/tests/xfs/040
index a6e98e3ad..f80066312 100755
--- a/tests/xfs/040
+++ b/tests/xfs/040
@@ -34,8 +34,8 @@ status=1	# failure is the default!
 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 [ -z "$KWORKAREA" ] && \
 	_notrun "Can't run srcdiff without KWORKAREA set"
diff --git a/tests/xfs/041 b/tests/xfs/041
index aa73245b7..47ab00ef0 100755
--- a/tests/xfs/041
+++ b/tests/xfs/041
@@ -43,8 +43,8 @@ _cleanup()
 trap "_cleanup ; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs xfs
diff --git a/tests/xfs/042 b/tests/xfs/042
index 5a60da165..0872273b6 100755
--- a/tests/xfs/042
+++ b/tests/xfs/042
@@ -43,8 +43,8 @@ _cleanup()
 trap "_cleanup ; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs xfs
diff --git a/tests/xfs/043 b/tests/xfs/043
index 11caf95d8..7413f0b1e 100755
--- a/tests/xfs/043
+++ b/tests/xfs/043
@@ -37,8 +37,8 @@ status=1	# failure is the default!
 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.dump
+. ./common/rc
+. ./common/dump
 
 # link correct .out file
 _link_out_file $seq.out $seqfull.out
diff --git a/tests/xfs/044 b/tests/xfs/044
index 369454c3a..33179ebd2 100755
--- a/tests/xfs/044
+++ b/tests/xfs/044
@@ -38,8 +38,8 @@ status=1	# failure is the default!
 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs xfs
diff --git a/tests/xfs/045 b/tests/xfs/045
index c8e19a43d..83e90d16e 100755
--- a/tests/xfs/045
+++ b/tests/xfs/045
@@ -35,8 +35,8 @@ status=1	# failure is the default!
 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 _get_existing_uuid()
 {
diff --git a/tests/xfs/046 b/tests/xfs/046
index 1420a3f84..a2b053b3c 100755
--- a/tests/xfs/046
+++ b/tests/xfs/046
@@ -34,8 +34,8 @@ status=1	# failure is the default!
 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.dump
+. ./common/rc
+. ./common/dump
 
 # real QA test starts here
 _supported_fs xfs
diff --git a/tests/xfs/047 b/tests/xfs/047
index 4891c6c3b..7597132d5 100755
--- a/tests/xfs/047
+++ b/tests/xfs/047
@@ -34,8 +34,8 @@ status=1	# failure is the default!
 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.dump
+. ./common/rc
+. ./common/dump
 
 # real QA test starts here
 _supported_fs xfs
diff --git a/tests/xfs/048 b/tests/xfs/048
index 30e16eecc..93d8bdab8 100755
--- a/tests/xfs/048
+++ b/tests/xfs/048
@@ -34,8 +34,8 @@ status=1	# failure is the default!
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 _cleanup()
 {
diff --git a/tests/xfs/049 b/tests/xfs/049
index 8591c367b..2c79a0fcf 100755
--- a/tests/xfs/049
+++ b/tests/xfs/049
@@ -48,8 +48,8 @@ status=1	# failure is the default!
 trap "_cleanup ; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs xfs
diff --git a/tests/xfs/050 b/tests/xfs/050
index d5da34a99..92e3d4c43 100755
--- a/tests/xfs/050
+++ b/tests/xfs/050
@@ -34,9 +34,9 @@ tmp=/tmp/$$
 status=1	# failure is the default!
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.quota
+. ./common/rc
+. ./common/filter
+. ./common/quota
 
 _cleanup()
 {
diff --git a/tests/xfs/052 b/tests/xfs/052
index 7655d856e..4b46fa5aa 100755
--- a/tests/xfs/052
+++ b/tests/xfs/052
@@ -36,9 +36,9 @@ tmp=/tmp/$$
 status=1	# failure is the default!
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.quota
+. ./common/rc
+. ./common/filter
+. ./common/quota
 
 _cleanup()
 {
diff --git a/tests/xfs/054 b/tests/xfs/054
index b92d6fe8b..33f363b13 100755
--- a/tests/xfs/054
+++ b/tests/xfs/054
@@ -34,9 +34,9 @@ tmp=/tmp/$$
 status=1	# failure is the default!
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.quota
+. ./common/rc
+. ./common/filter
+. ./common/quota
 
 _cleanup()
 {
diff --git a/tests/xfs/055 b/tests/xfs/055
index bac082684..90c5b7d5a 100755
--- a/tests/xfs/055
+++ b/tests/xfs/055
@@ -35,8 +35,8 @@ status=1	# failure is the default!
 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.dump
+. ./common/rc
+. ./common/dump
 
 # link correct .out file
 _link_out_file $seq.out $seqfull.out
diff --git a/tests/xfs/056 b/tests/xfs/056
index dfab65343..8fd7a339a 100755
--- a/tests/xfs/056
+++ b/tests/xfs/056
@@ -35,8 +35,8 @@ status=0	# success is the default!
 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.dump
+. ./common/rc
+. ./common/dump
 
 # real QA test starts here
 _supported_fs xfs
diff --git a/tests/xfs/057 b/tests/xfs/057
index bc535792c..e0ddd01d7 100755
--- a/tests/xfs/057
+++ b/tests/xfs/057
@@ -34,8 +34,8 @@ status=1	# failure is the default!
 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 _notrun "Place holder for IRIX test 057"
 
diff --git a/tests/xfs/058 b/tests/xfs/058
index 8d4a1aa05..d84e79f6e 100755
--- a/tests/xfs/058
+++ b/tests/xfs/058
@@ -34,8 +34,8 @@ status=1	# failure is the default!
 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 _notrun "Place holder for IRIX test 058"
 
diff --git a/tests/xfs/059 b/tests/xfs/059
index 36ba942fa..c8b674bc6 100755
--- a/tests/xfs/059
+++ b/tests/xfs/059
@@ -34,8 +34,8 @@ status=0	# success is the default!
 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.dump
+. ./common/rc
+. ./common/dump
 
 # real QA test starts here
 _supported_fs xfs
diff --git a/tests/xfs/060 b/tests/xfs/060
index 9bcc9aae8..ba9ea345d 100755
--- a/tests/xfs/060
+++ b/tests/xfs/060
@@ -34,8 +34,8 @@ status=0	# success is the default!
 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.dump
+. ./common/rc
+. ./common/dump
 
 # real QA test starts here
 _supported_fs xfs
diff --git a/tests/xfs/061 b/tests/xfs/061
index 88cd8ff62..fedce6747 100755
--- a/tests/xfs/061
+++ b/tests/xfs/061
@@ -34,8 +34,8 @@ status=0	# success is the default!
 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.dump
+. ./common/rc
+. ./common/dump
 
 # real QA test starts here
 _supported_fs xfs
diff --git a/tests/xfs/063 b/tests/xfs/063
index 46e4baca1..b194dfdc8 100755
--- a/tests/xfs/063
+++ b/tests/xfs/063
@@ -34,10 +34,10 @@ status=1	# failure is the default!
 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.dump
-. ./common.attr
+. ./common/rc
+. ./common/filter
+. ./common/dump
+. ./common/attr
 
 # real QA test starts here
 _supported_fs xfs
diff --git a/tests/xfs/064 b/tests/xfs/064
index 4f2143d47..e8fa7e153 100755
--- a/tests/xfs/064
+++ b/tests/xfs/064
@@ -34,9 +34,9 @@ status=1	# failure is the default!
 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.dump
+. ./common/rc
+. ./common/filter
+. ./common/dump
 
 
 _ls_size_filter()
diff --git a/tests/xfs/065 b/tests/xfs/065
index d3efdac4b..c0e77eef8 100755
--- a/tests/xfs/065
+++ b/tests/xfs/065
@@ -37,9 +37,9 @@ status=1	# failure is the default!
 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.dump
+. ./common/rc
+. ./common/filter
+. ./common/dump
 
 #
 # list recursively the directory
diff --git a/tests/xfs/066 b/tests/xfs/066
index 130b6858e..a27d260bd 100755
--- a/tests/xfs/066
+++ b/tests/xfs/066
@@ -34,9 +34,9 @@ status=1	# failure is the default!
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.dump
+. ./common/rc
+. ./common/filter
+. ./common/dump
 
 _cleanup()
 {
diff --git a/tests/xfs/067 b/tests/xfs/067
index dd20b8ac0..9c306f2e6 100755
--- a/tests/xfs/067
+++ b/tests/xfs/067
@@ -34,9 +34,9 @@ status=1	# failure is the default!
 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.attr
+. ./common/rc
+. ./common/filter
+. ./common/attr
 
 # real QA test starts here
 _supported_fs xfs
diff --git a/tests/xfs/071 b/tests/xfs/071
index 6d6eceef0..92a8ed340 100755
--- a/tests/xfs/071
+++ b/tests/xfs/071
@@ -42,8 +42,8 @@ _cleanup()
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 bitsperlong=`src/feature -w`
 # link correct .out file
diff --git a/tests/xfs/072 b/tests/xfs/072
index 5c796a9c9..c55befc3b 100755
--- a/tests/xfs/072
+++ b/tests/xfs/072
@@ -41,8 +41,8 @@ status=1	# failure is the default!
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs xfs
diff --git a/tests/xfs/073 b/tests/xfs/073
index bdc4dc22c..72fdba56b 100755
--- a/tests/xfs/073
+++ b/tests/xfs/073
@@ -33,8 +33,8 @@ tmp=/tmp/$$
 status=1	# failure is the default!
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # don't put fs images in /tmp
 imgs=$TEST_DIR/$$
diff --git a/tests/xfs/078 b/tests/xfs/078
index a897e60cb..2119a2bc9 100755
--- a/tests/xfs/078
+++ b/tests/xfs/078
@@ -44,8 +44,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # loop devices are available in Linux only
 _supported_fs xfs
diff --git a/tests/xfs/080 b/tests/xfs/080
index 952d31e7b..27d6cd0a7 100755
--- a/tests/xfs/080
+++ b/tests/xfs/080
@@ -34,8 +34,8 @@ status=1	# failure is the default!
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 _cleanup()
 { 
diff --git a/tests/xfs/081 b/tests/xfs/081
index 316172c86..25f9cd864 100755
--- a/tests/xfs/081
+++ b/tests/xfs/081
@@ -33,10 +33,10 @@ tmp=/tmp/$$
 status=1	# failure is the default!
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.log
-. ./common.quota
+. ./common/rc
+. ./common/filter
+. ./common/log
+. ./common/quota
 
 # real QA test starts here
 _supported_fs xfs
diff --git a/tests/xfs/082 b/tests/xfs/082
index 83b5708ca..29bcbe52f 100755
--- a/tests/xfs/082
+++ b/tests/xfs/082
@@ -34,9 +34,9 @@ tmp=/tmp/$$
 status=1	# failure is the default!
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.log
+. ./common/rc
+. ./common/filter
+. ./common/log
 
 _cleanup()
 {
diff --git a/tests/xfs/084 b/tests/xfs/084
index d4482f83c..144421fc3 100755
--- a/tests/xfs/084
+++ b/tests/xfs/084
@@ -35,8 +35,8 @@ status=1	# failure is the default!
 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 _filter_resv()
 {
diff --git a/tests/xfs/085 b/tests/xfs/085
index c72d94eab..9873530e6 100755
--- a/tests/xfs/085
+++ b/tests/xfs/085
@@ -37,9 +37,9 @@ status=1	# failure is the default!
 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.log
+. ./common/rc
+. ./common/filter
+. ./common/log
 
 # real QA test starts here
 _supported_fs xfs
diff --git a/tests/xfs/086 b/tests/xfs/086
index b58780a34..413c9fa68 100755
--- a/tests/xfs/086
+++ b/tests/xfs/086
@@ -36,9 +36,9 @@ status=1	# failure is the default!
 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.log
+. ./common/rc
+. ./common/filter
+. ./common/log
 
 # real QA test starts here
 _supported_fs xfs
diff --git a/tests/xfs/087 b/tests/xfs/087
index 43c23f05f..e4bc41818 100755
--- a/tests/xfs/087
+++ b/tests/xfs/087
@@ -36,10 +36,10 @@ status=1	# failure is the default!
 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.log
-. ./common.quota
+. ./common/rc
+. ./common/filter
+. ./common/log
+. ./common/quota
 
 _do_meta()
 {
diff --git a/tests/xfs/090 b/tests/xfs/090
index 4b006d42d..79d708b5a 100755
--- a/tests/xfs/090
+++ b/tests/xfs/090
@@ -34,8 +34,8 @@ status=1	# failure is the default!
 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs xfs
diff --git a/tests/xfs/092 b/tests/xfs/092
index 76aa5c160..722d1cc1a 100755
--- a/tests/xfs/092
+++ b/tests/xfs/092
@@ -40,8 +40,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 
diff --git a/tests/xfs/094 b/tests/xfs/094
index 04b096c25..843869799 100755
--- a/tests/xfs/094
+++ b/tests/xfs/094
@@ -40,8 +40,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs xfs
diff --git a/tests/xfs/095 b/tests/xfs/095
index f31a88a3c..f090ec791 100755
--- a/tests/xfs/095
+++ b/tests/xfs/095
@@ -40,9 +40,9 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.log
+. ./common/rc
+. ./common/filter
+. ./common/log
 
 # real QA test starts here
 
diff --git a/tests/xfs/096 b/tests/xfs/096
index a011cabd7..58f392dc4 100755
--- a/tests/xfs/096
+++ b/tests/xfs/096
@@ -42,9 +42,9 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.log
+. ./common/rc
+. ./common/filter
+. ./common/log
 
 #
 # filter out counts which will vary
diff --git a/tests/xfs/103 b/tests/xfs/103
index 0753f8ae5..0cb51f281 100755
--- a/tests/xfs/103
+++ b/tests/xfs/103
@@ -34,8 +34,8 @@ status=1	# failure is the default!
 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 _create_scratch()
 {
diff --git a/tests/xfs/104 b/tests/xfs/104
index 3af52c77e..8fca28144 100755
--- a/tests/xfs/104
+++ b/tests/xfs/104
@@ -34,8 +34,8 @@ status=1	# failure is the default!
 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 _create_scratch()
 {
diff --git a/tests/xfs/106 b/tests/xfs/106
index 58d753b18..96476ee29 100755
--- a/tests/xfs/106
+++ b/tests/xfs/106
@@ -36,9 +36,9 @@ status=1	# failure is the default!
 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.quota
+. ./common/rc
+. ./common/filter
+. ./common/quota
 
 _supported_fs xfs
 _supported_os Linux #IRIX
diff --git a/tests/xfs/107 b/tests/xfs/107
index 7abee5ee5..9c7c4404e 100755
--- a/tests/xfs/107
+++ b/tests/xfs/107
@@ -36,9 +36,9 @@ status=1	# failure is the default!
 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.quota
+. ./common/rc
+. ./common/filter
+. ./common/quota
 
 filter_xfs_quota()
 {
diff --git a/tests/xfs/108 b/tests/xfs/108
index 9f2315088..ae70bfb2a 100755
--- a/tests/xfs/108
+++ b/tests/xfs/108
@@ -34,9 +34,9 @@ status=1	# failure is the default!
 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.quota
+. ./common/rc
+. ./common/filter
+. ./common/quota
 
 # real QA test starts here
 _supported_fs xfs
diff --git a/tests/xfs/109 b/tests/xfs/109
index 0a115b7b5..8afb81f71 100755
--- a/tests/xfs/109
+++ b/tests/xfs/109
@@ -34,8 +34,8 @@ status=1	# failure is the default!
 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs xfs
diff --git a/tests/xfs/110 b/tests/xfs/110
index 52c782c69..8deb45d2d 100755
--- a/tests/xfs/110
+++ b/tests/xfs/110
@@ -34,8 +34,8 @@ status=1	# failure is the default!
 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs xfs
diff --git a/tests/xfs/111 b/tests/xfs/111
index 94fd93fec..cd468a62c 100755
--- a/tests/xfs/111
+++ b/tests/xfs/111
@@ -34,8 +34,8 @@ status=1	# failure is the default!
 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs xfs
diff --git a/tests/xfs/114 b/tests/xfs/114
index 61dd7819f..91bdd4d0a 100755
--- a/tests/xfs/114
+++ b/tests/xfs/114
@@ -307,9 +307,9 @@ _test_dirstress()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.attr
+. ./common/rc
+. ./common/filter
+. ./common/attr
 
 _supported_fs xfs
 _supported_os IRIX
diff --git a/tests/xfs/115 b/tests/xfs/115
index bb98ee5a3..8d25f74fd 100755
--- a/tests/xfs/115
+++ b/tests/xfs/115
@@ -94,9 +94,9 @@ _filter()
 
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.attr
+. ./common/rc
+. ./common/filter
+. ./common/attr
 
 _supported_fs xfs
 _supported_os IRIX
diff --git a/tests/xfs/116 b/tests/xfs/116
index a996117f6..3f9ed8e95 100755
--- a/tests/xfs/116
+++ b/tests/xfs/116
@@ -42,9 +42,9 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.quota
+. ./common/rc
+. ./common/filter
+. ./common/quota
 
 # real QA test starts here
 
diff --git a/tests/xfs/118 b/tests/xfs/118
index 4145ea267..4608e28eb 100755
--- a/tests/xfs/118
+++ b/tests/xfs/118
@@ -42,9 +42,9 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.quota
+. ./common/rc
+. ./common/filter
+. ./common/quota
 
 # real QA test starts here
 
diff --git a/tests/xfs/119 b/tests/xfs/119
index e3b207365..43bc03cbd 100755
--- a/tests/xfs/119
+++ b/tests/xfs/119
@@ -42,8 +42,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 
diff --git a/tests/xfs/121 b/tests/xfs/121
index d2dc9359c..a0ff3477b 100755
--- a/tests/xfs/121
+++ b/tests/xfs/121
@@ -38,9 +38,9 @@ status=1	# failure is the default!
 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.log
+. ./common/rc
+. ./common/filter
+. ./common/log
 
 # real QA test starts here
 _supported_fs xfs
diff --git a/tests/xfs/122 b/tests/xfs/122
index d3a97071f..e4beef15f 100755
--- a/tests/xfs/122
+++ b/tests/xfs/122
@@ -36,7 +36,7 @@ status=1	# failure is the default!
 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # get standard environment
-. ./common.rc
+. ./common/rc
 
 # real QA test starts here
 _supported_fs xfs
diff --git a/tests/xfs/134 b/tests/xfs/134
index 0fffbe550..8b8f6e57e 100755
--- a/tests/xfs/134
+++ b/tests/xfs/134
@@ -34,9 +34,9 @@ tmp=/tmp/$$
 status=1	# failure is the default!
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.quota
+. ./common/rc
+. ./common/filter
+. ./common/quota
 
 _cleanup()
 {
diff --git a/tests/xfs/136 b/tests/xfs/136
index 97378c432..fe1343c3f 100755
--- a/tests/xfs/136
+++ b/tests/xfs/136
@@ -42,9 +42,9 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.attr
+. ./common/rc
+. ./common/filter
+. ./common/attr
 
 # real QA test starts here
 
diff --git a/tests/xfs/137 b/tests/xfs/137
index 8bcc1f864..d54ac1424 100755
--- a/tests/xfs/137
+++ b/tests/xfs/137
@@ -39,8 +39,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs xfs
diff --git a/tests/xfs/138 b/tests/xfs/138
index d476fa796..95fb8b940 100755
--- a/tests/xfs/138
+++ b/tests/xfs/138
@@ -39,8 +39,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs xfs
diff --git a/tests/xfs/139 b/tests/xfs/139
index bb5ea2c38..9025c3a6f 100755
--- a/tests/xfs/139
+++ b/tests/xfs/139
@@ -39,8 +39,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs xfs
diff --git a/tests/xfs/140 b/tests/xfs/140
index 2031ed9be..1f8b7ba84 100755
--- a/tests/xfs/140
+++ b/tests/xfs/140
@@ -39,8 +39,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs xfs
diff --git a/tests/xfs/142 b/tests/xfs/142
index 309083651..d3963c664 100755
--- a/tests/xfs/142
+++ b/tests/xfs/142
@@ -39,9 +39,9 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.dmapi
+. ./common/rc
+. ./common/filter
+. ./common/dmapi
 
 # real QA test starts here
 _supported_fs xfs
diff --git a/tests/xfs/143 b/tests/xfs/143
index c921e381b..5ba237216 100755
--- a/tests/xfs/143
+++ b/tests/xfs/143
@@ -39,9 +39,9 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.dmapi
+. ./common/rc
+. ./common/filter
+. ./common/dmapi
 
 # real QA test starts here
 _supported_fs xfs
diff --git a/tests/xfs/144 b/tests/xfs/144
index f25102125..3f78009ae 100755
--- a/tests/xfs/144
+++ b/tests/xfs/144
@@ -39,9 +39,9 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.dmapi
+. ./common/rc
+. ./common/filter
+. ./common/dmapi
 
 # real QA test starts here
 _supported_fs xfs
diff --git a/tests/xfs/145 b/tests/xfs/145
index 093ff3324..4fdf41c44 100755
--- a/tests/xfs/145
+++ b/tests/xfs/145
@@ -39,9 +39,9 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.dmapi
+. ./common/rc
+. ./common/filter
+. ./common/dmapi
 
 # real QA test starts here
 _supported_fs xfs
diff --git a/tests/xfs/146 b/tests/xfs/146
index 87adba469..468c4d21e 100755
--- a/tests/xfs/146
+++ b/tests/xfs/146
@@ -46,9 +46,9 @@ _report_filter () {
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.dmapi
+. ./common/rc
+. ./common/filter
+. ./common/dmapi
 
 # real QA test starts here
 _supported_fs xfs
diff --git a/tests/xfs/147 b/tests/xfs/147
index 0cc4047a0..b125a8a3e 100755
--- a/tests/xfs/147
+++ b/tests/xfs/147
@@ -39,9 +39,9 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.dmapi
+. ./common/rc
+. ./common/filter
+. ./common/dmapi
 
 # real QA test starts here
 _supported_fs xfs
diff --git a/tests/xfs/148 b/tests/xfs/148
index 20ba12ec5..6d0b53fca 100755
--- a/tests/xfs/148
+++ b/tests/xfs/148
@@ -43,9 +43,9 @@ _cleanup()
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.repair
+. ./common/rc
+. ./common/filter
+. ./common/repair
 
 [ -z "$XFS_PARALLEL_REPAIR64_PROG" ] && _notrun "parallel repair binary xfs_prepair64 is not installed"
 
diff --git a/tests/xfs/149 b/tests/xfs/149
index 47b5a58e8..4a875e701 100755
--- a/tests/xfs/149
+++ b/tests/xfs/149
@@ -36,9 +36,9 @@ trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 rm -f $seqres.full
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.repair
-. ./common.filter
+. ./common/rc
+. ./common/repair
+. ./common/filter
 
 [ -z "$XFS_PARALLEL_REPAIR_PROG" ] && _notrun "parallel repair binary xfs_prepair is not installed"
 
diff --git a/tests/xfs/150 b/tests/xfs/150
index ae33d1c3d..3e4060e1c 100755
--- a/tests/xfs/150
+++ b/tests/xfs/150
@@ -44,9 +44,9 @@ _filter_fs_handle()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.dmapi
+. ./common/rc
+. ./common/filter
+. ./common/dmapi
 
 # real QA test starts here
 _supported_fs xfs
diff --git a/tests/xfs/151 b/tests/xfs/151
index d1b65e7b8..fa9e8e176 100755
--- a/tests/xfs/151
+++ b/tests/xfs/151
@@ -65,9 +65,9 @@ _check_sids()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.dmapi
+. ./common/rc
+. ./common/filter
+. ./common/dmapi
 
 # real QA test starts here
 _supported_fs xfs
diff --git a/tests/xfs/152 b/tests/xfs/152
index 35981acd8..6c90a7c4e 100755
--- a/tests/xfs/152
+++ b/tests/xfs/152
@@ -45,9 +45,9 @@ _filter_handles()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.dmapi
+. ./common/rc
+. ./common/filter
+. ./common/dmapi
 
 # real QA test starts here
 _supported_fs xfs
diff --git a/tests/xfs/153 b/tests/xfs/153
index 75ae57bb4..542dc0b88 100755
--- a/tests/xfs/153
+++ b/tests/xfs/153
@@ -40,9 +40,9 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.dmapi
+. ./common/rc
+. ./common/filter
+. ./common/dmapi
 
 # real QA test starts here
 _supported_fs xfs
diff --git a/tests/xfs/154 b/tests/xfs/154
index 3b032a813..f403915cb 100755
--- a/tests/xfs/154
+++ b/tests/xfs/154
@@ -39,9 +39,9 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.dmapi
+. ./common/rc
+. ./common/filter
+. ./common/dmapi
 
 # real QA test starts here
 _supported_fs xfs
diff --git a/tests/xfs/155 b/tests/xfs/155
index e379ebde1..2a654ae7a 100755
--- a/tests/xfs/155
+++ b/tests/xfs/155
@@ -39,9 +39,9 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.dmapi
+. ./common/rc
+. ./common/filter
+. ./common/dmapi
 
 # real QA test starts here
 _supported_fs xfs
diff --git a/tests/xfs/156 b/tests/xfs/156
index f37809cf7..028f3c192 100755
--- a/tests/xfs/156
+++ b/tests/xfs/156
@@ -39,9 +39,9 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.dmapi
+. ./common/rc
+. ./common/filter
+. ./common/dmapi
 
 # real QA test starts here
 _supported_fs xfs
diff --git a/tests/xfs/157 b/tests/xfs/157
index 1bd705265..63e10049b 100755
--- a/tests/xfs/157
+++ b/tests/xfs/157
@@ -39,9 +39,9 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.dmapi
+. ./common/rc
+. ./common/filter
+. ./common/dmapi
 
 # real QA test starts here
 _supported_fs xfs
diff --git a/tests/xfs/158 b/tests/xfs/158
index 137120039..5031f24b4 100755
--- a/tests/xfs/158
+++ b/tests/xfs/158
@@ -39,9 +39,9 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.dmapi
+. ./common/rc
+. ./common/filter
+. ./common/dmapi
 
 # real QA test starts here
 _supported_fs xfs
diff --git a/tests/xfs/159 b/tests/xfs/159
index cb954c879..90e6b2bf1 100755
--- a/tests/xfs/159
+++ b/tests/xfs/159
@@ -39,9 +39,9 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.dmapi
+. ./common/rc
+. ./common/filter
+. ./common/dmapi
 
 # real QA test starts here
 _supported_fs xfs
diff --git a/tests/xfs/160 b/tests/xfs/160
index 4c3c53da0..2e8dfd849 100755
--- a/tests/xfs/160
+++ b/tests/xfs/160
@@ -39,9 +39,9 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.dmapi
+. ./common/rc
+. ./common/filter
+. ./common/dmapi
 
 # real QA test starts here
 _supported_fs xfs
diff --git a/tests/xfs/161 b/tests/xfs/161
index 39249acad..0bb699897 100755
--- a/tests/xfs/161
+++ b/tests/xfs/161
@@ -46,9 +46,9 @@ _filter_get_allocinfo()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.dmapi
+. ./common/rc
+. ./common/filter
+. ./common/dmapi
 
 # real QA test starts here
 _supported_fs xfs
diff --git a/tests/xfs/162 b/tests/xfs/162
index 57f027db9..e50d38595 100755
--- a/tests/xfs/162
+++ b/tests/xfs/162
@@ -39,9 +39,9 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.dmapi
+. ./common/rc
+. ./common/filter
+. ./common/dmapi
 
 # real QA test starts here
 _supported_fs xfs
diff --git a/tests/xfs/163 b/tests/xfs/163
index b1857fe4b..36f5a7d4d 100755
--- a/tests/xfs/163
+++ b/tests/xfs/163
@@ -50,9 +50,9 @@ _filter_handles()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.dmapi
+. ./common/rc
+. ./common/filter
+. ./common/dmapi
 
 # real QA test starts here
 _supported_fs xfs
diff --git a/tests/xfs/164 b/tests/xfs/164
index ed2cb5500..0eeff9d0a 100755
--- a/tests/xfs/164
+++ b/tests/xfs/164
@@ -63,8 +63,8 @@ _filter_bmap()
 
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 
diff --git a/tests/xfs/165 b/tests/xfs/165
index ec14cbfd2..679b1774d 100755
--- a/tests/xfs/165
+++ b/tests/xfs/165
@@ -59,8 +59,8 @@ _filter_bmap()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 
diff --git a/tests/xfs/166 b/tests/xfs/166
index a19383755..7f3878e82 100755
--- a/tests/xfs/166
+++ b/tests/xfs/166
@@ -40,8 +40,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # assumes 1st, 3rd and 5th blocks are single written blocks,
 # the others are unwritten.
diff --git a/tests/xfs/167 b/tests/xfs/167
index 53100dfc9..5352d8604 100755
--- a/tests/xfs/167
+++ b/tests/xfs/167
@@ -52,8 +52,8 @@ workout()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs xfs
diff --git a/tests/xfs/168 b/tests/xfs/168
index 405b0264f..ca8d88df4 100755
--- a/tests/xfs/168
+++ b/tests/xfs/168
@@ -64,9 +64,9 @@ s/^\s*\n//g ;
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.dmapi
+. ./common/rc
+. ./common/filter
+. ./common/dmapi
 
 # real QA test starts here
 _supported_fs xfs
diff --git a/tests/xfs/170 b/tests/xfs/170
index d1423a93c..290d3b22a 100755
--- a/tests/xfs/170
+++ b/tests/xfs/170
@@ -43,9 +43,9 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.filestreams
+. ./common/rc
+. ./common/filter
+. ./common/filestreams
 
 # real QA test starts here
 _supported_fs xfs
diff --git a/tests/xfs/171 b/tests/xfs/171
index c6ca99b26..35c1848dc 100755
--- a/tests/xfs/171
+++ b/tests/xfs/171
@@ -42,9 +42,9 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.filestreams
+. ./common/rc
+. ./common/filter
+. ./common/filestreams
 
 # real QA test starts here
 _supported_fs xfs
diff --git a/tests/xfs/172 b/tests/xfs/172
index d7e84c7f7..ccbae7c67 100755
--- a/tests/xfs/172
+++ b/tests/xfs/172
@@ -42,9 +42,9 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.filestreams
+. ./common/rc
+. ./common/filter
+. ./common/filestreams
 
 # real QA test starts here
 _supported_fs xfs
diff --git a/tests/xfs/173 b/tests/xfs/173
index 86cd83b72..44a8e4ca1 100755
--- a/tests/xfs/173
+++ b/tests/xfs/173
@@ -42,9 +42,9 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.filestreams
+. ./common/rc
+. ./common/filter
+. ./common/filestreams
 
 # real QA test starts here
 _supported_fs xfs
diff --git a/tests/xfs/174 b/tests/xfs/174
index f711d9c46..0d0698690 100755
--- a/tests/xfs/174
+++ b/tests/xfs/174
@@ -42,9 +42,9 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.filestreams
+. ./common/rc
+. ./common/filter
+. ./common/filestreams
 
 # real QA test starts here
 _supported_fs xfs
diff --git a/tests/xfs/175 b/tests/xfs/175
index bfb126c93..56d4af445 100755
--- a/tests/xfs/175
+++ b/tests/xfs/175
@@ -43,10 +43,10 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.dmapi
-. ./common.punch
+. ./common/rc
+. ./common/filter
+. ./common/dmapi
+. ./common/punch
 
 # real QA test starts here
 _supported_fs xfs
diff --git a/tests/xfs/176 b/tests/xfs/176
index 0b45677c1..ba8da5adb 100755
--- a/tests/xfs/176
+++ b/tests/xfs/176
@@ -40,10 +40,10 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.dmapi
-. ./common.punch
+. ./common/rc
+. ./common/filter
+. ./common/dmapi
+. ./common/punch
 
 # real QA test starts here
 _supported_fs xfs
diff --git a/tests/xfs/177 b/tests/xfs/177
index 44e82c76a..ca748ba4e 100755
--- a/tests/xfs/177
+++ b/tests/xfs/177
@@ -41,9 +41,9 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.dmapi
+. ./common/rc
+. ./common/filter
+. ./common/dmapi
 
 # real QA test starts here
 
diff --git a/tests/xfs/178 b/tests/xfs/178
index 9d0e186f1..7ea5f623e 100755
--- a/tests/xfs/178
+++ b/tests/xfs/178
@@ -55,9 +55,9 @@ _dd_repair_check()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.repair
+. ./common/rc
+. ./common/filter
+. ./common/repair
 
 # real QA test starts here
 
diff --git a/tests/xfs/179 b/tests/xfs/179
index 3bb01a994..fafb934d9 100755
--- a/tests/xfs/179
+++ b/tests/xfs/179
@@ -40,8 +40,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs xfs
diff --git a/tests/xfs/180 b/tests/xfs/180
index 492665240..91dc9605f 100755
--- a/tests/xfs/180
+++ b/tests/xfs/180
@@ -40,8 +40,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs xfs
diff --git a/tests/xfs/181 b/tests/xfs/181
index 36329caa5..830674e0f 100755
--- a/tests/xfs/181
+++ b/tests/xfs/181
@@ -45,9 +45,9 @@ status=1	# failure is the default!
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.log
+. ./common/rc
+. ./common/filter
+. ./common/log
 
 # real QA test starts here
 _supported_fs xfs
diff --git a/tests/xfs/182 b/tests/xfs/182
index 89444693a..15ca9e198 100755
--- a/tests/xfs/182
+++ b/tests/xfs/182
@@ -40,8 +40,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs xfs
diff --git a/tests/xfs/183 b/tests/xfs/183
index 4fc16b1f4..4ad6ebf49 100755
--- a/tests/xfs/183
+++ b/tests/xfs/183
@@ -41,8 +41,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 
diff --git a/tests/xfs/185 b/tests/xfs/185
index 294363436..114f79688 100755
--- a/tests/xfs/185
+++ b/tests/xfs/185
@@ -39,9 +39,9 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.dmapi
+. ./common/rc
+. ./common/filter
+. ./common/dmapi
 
 # real QA test starts here
 _supported_fs xfs
diff --git a/tests/xfs/186 b/tests/xfs/186
index d162167e6..e36015909 100755
--- a/tests/xfs/186
+++ b/tests/xfs/186
@@ -138,9 +138,9 @@ _changeto_attr1()
 
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.attr
+. ./common/rc
+. ./common/filter
+. ./common/attr
 
 # real QA test starts here
 
diff --git a/tests/xfs/187 b/tests/xfs/187
index b2b73f0c1..f521a5d90 100755
--- a/tests/xfs/187
+++ b/tests/xfs/187
@@ -50,9 +50,9 @@ _filter_version()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.attr
+. ./common/rc
+. ./common/filter
+. ./common/attr
 
 # real QA test starts here
 _supported_fs xfs
diff --git a/tests/xfs/188 b/tests/xfs/188
index 1ffa4baf0..6bd850dde 100755
--- a/tests/xfs/188
+++ b/tests/xfs/188
@@ -48,8 +48,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs xfs
diff --git a/tests/xfs/189 b/tests/xfs/189
index 63a39d7fe..a8fcda86f 100755
--- a/tests/xfs/189
+++ b/tests/xfs/189
@@ -194,8 +194,8 @@ _putback_scratch_fstab()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs xfs
diff --git a/tests/xfs/190 b/tests/xfs/190
index 60d8adbcc..8826b5e1a 100755
--- a/tests/xfs/190
+++ b/tests/xfs/190
@@ -46,8 +46,8 @@ status=0    # success is the default!
 rm -f $seqres.full
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs xfs
diff --git a/tests/xfs/191 b/tests/xfs/191
index 8e61629cb..d10429468 100755
--- a/tests/xfs/191
+++ b/tests/xfs/191
@@ -34,8 +34,8 @@ status=1	# failure is the default!
 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 
diff --git a/tests/xfs/194 b/tests/xfs/194
index 9d439a6c1..11aca16d8 100755
--- a/tests/xfs/194
+++ b/tests/xfs/194
@@ -39,8 +39,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # only xfs supported due to use of xfs_bmap
 _supported_fs xfs
diff --git a/tests/xfs/195 b/tests/xfs/195
index aed247160..66c9b9475 100755
--- a/tests/xfs/195
+++ b/tests/xfs/195
@@ -58,8 +58,8 @@ _do_dump()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs xfs
diff --git a/tests/xfs/196 b/tests/xfs/196
index 41353b9b0..a471affb6 100755
--- a/tests/xfs/196
+++ b/tests/xfs/196
@@ -43,9 +43,9 @@ _cleanup()
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.quota
+. ./common/rc
+. ./common/filter
+. ./common/quota
 
 # real QA test starts here
 _supported_fs xfs
diff --git a/tests/xfs/197 b/tests/xfs/197
index b7bb23324..2a205289c 100755
--- a/tests/xfs/197
+++ b/tests/xfs/197
@@ -44,8 +44,8 @@ _cleanup()
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs xfs
diff --git a/tests/xfs/199 b/tests/xfs/199
index c141b81d4..57aff065f 100755
--- a/tests/xfs/199
+++ b/tests/xfs/199
@@ -42,8 +42,8 @@ _cleanup()
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs xfs
diff --git a/tests/xfs/200 b/tests/xfs/200
index 0f8d9ede3..4a3d7c567 100755
--- a/tests/xfs/200
+++ b/tests/xfs/200
@@ -39,8 +39,8 @@ _cleanup()
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs xfs
diff --git a/tests/xfs/201 b/tests/xfs/201
index 80a65e680..9bb8e1ba3 100755
--- a/tests/xfs/201
+++ b/tests/xfs/201
@@ -52,8 +52,8 @@ _cleanup()
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs xfs
diff --git a/tests/xfs/202 b/tests/xfs/202
index 6c82ac00b..4670f289f 100755
--- a/tests/xfs/202
+++ b/tests/xfs/202
@@ -32,9 +32,9 @@ tmp=/tmp/$$
 status=1	# failure is the default!
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.repair
+. ./common/rc
+. ./common/filter
+. ./common/repair
 
 # real QA test starts here
 _supported_fs xfs
diff --git a/tests/xfs/203 b/tests/xfs/203
index 21ec98ac0..f009027dc 100755
--- a/tests/xfs/203
+++ b/tests/xfs/203
@@ -67,8 +67,8 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 rm -f $seqres.full
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs xfs
diff --git a/tests/xfs/205 b/tests/xfs/205
index 1d64eb7e6..1a726571f 100755
--- a/tests/xfs/205
+++ b/tests/xfs/205
@@ -32,8 +32,8 @@ tmp=/tmp/$$
 status=1	# failure is the default!
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs xfs
diff --git a/tests/xfs/206 b/tests/xfs/206
index 785de8f8d..fce1497cd 100755
--- a/tests/xfs/206
+++ b/tests/xfs/206
@@ -47,8 +47,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 
diff --git a/tests/xfs/216 b/tests/xfs/216
index c82ea9e88..9e2c584f3 100755
--- a/tests/xfs/216
+++ b/tests/xfs/216
@@ -40,8 +40,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs xfs
diff --git a/tests/xfs/217 b/tests/xfs/217
index f6c7c736c..4072b0c77 100755
--- a/tests/xfs/217
+++ b/tests/xfs/217
@@ -40,8 +40,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs xfs
diff --git a/tests/xfs/220 b/tests/xfs/220
index 3f6503b7c..545a03379 100755
--- a/tests/xfs/220
+++ b/tests/xfs/220
@@ -43,9 +43,9 @@ _cleanup()
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.quota
+. ./common/rc
+. ./common/filter
+. ./common/quota
 
 # real QA test starts here
 _supported_fs xfs
diff --git a/tests/xfs/222 b/tests/xfs/222
index 9a78db566..c2083f8eb 100755
--- a/tests/xfs/222
+++ b/tests/xfs/222
@@ -43,8 +43,8 @@ _cleanup()
 trap "_cleanup ; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs xfs
diff --git a/tests/xfs/227 b/tests/xfs/227
index f988b1715..0be0eae4c 100755
--- a/tests/xfs/227
+++ b/tests/xfs/227
@@ -45,8 +45,8 @@ _cleanup()
 trap "_cleanup ; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs xfs
diff --git a/tests/xfs/229 b/tests/xfs/229
index b34ab1bb1..b16990e25 100755
--- a/tests/xfs/229
+++ b/tests/xfs/229
@@ -46,7 +46,7 @@ _cleanup()
 trap "_cleanup ; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
+. ./common/rc
 
 # real QA test starts here
 _supported_fs xfs
diff --git a/tests/xfs/238 b/tests/xfs/238
index beff54088..169e232c5 100755
--- a/tests/xfs/238
+++ b/tests/xfs/238
@@ -39,8 +39,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 
diff --git a/tests/xfs/242 b/tests/xfs/242
index ef6ec20c4..7c9b276cf 100755
--- a/tests/xfs/242
+++ b/tests/xfs/242
@@ -40,9 +40,9 @@ _cleanup()
 trap "_cleanup ; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.punch
+. ./common/rc
+. ./common/filter
+. ./common/punch
 
 # real QA test starts here
 _supported_fs xfs
diff --git a/tests/xfs/244 b/tests/xfs/244
index 9678fc700..2bf839ab4 100755
--- a/tests/xfs/244
+++ b/tests/xfs/244
@@ -34,9 +34,9 @@ status=1	# failure is the default!
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.quota
+. ./common/rc
+. ./common/filter
+. ./common/quota
 
 _cleanup()
 {
diff --git a/tests/xfs/250 b/tests/xfs/250
index 8563b1ea1..a01d4eed9 100755
--- a/tests/xfs/250
+++ b/tests/xfs/250
@@ -42,8 +42,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs xfs
diff --git a/tests/xfs/252 b/tests/xfs/252
index 745f609ee..e9ae0736a 100755
--- a/tests/xfs/252
+++ b/tests/xfs/252
@@ -40,9 +40,9 @@ _cleanup()
 trap "_cleanup ; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.punch
+. ./common/rc
+. ./common/filter
+. ./common/punch
 
 # real QA test starts here
 _supported_fs xfs 
diff --git a/tests/xfs/253 b/tests/xfs/253
index 915bb26ae..fb5c7c462 100755
--- a/tests/xfs/253
+++ b/tests/xfs/253
@@ -52,8 +52,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 _require_scratch
 
diff --git a/tests/xfs/259 b/tests/xfs/259
index 47f2cfa45..7e72e4b62 100755
--- a/tests/xfs/259
+++ b/tests/xfs/259
@@ -38,7 +38,7 @@ _cleanup()
 trap "_cleanup ; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
+. ./common/rc
 
 # real QA test starts here
 _supported_fs xfs
diff --git a/tests/xfs/261 b/tests/xfs/261
index 65701769d..ed5d6f392 100755
--- a/tests/xfs/261
+++ b/tests/xfs/261
@@ -48,9 +48,9 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.quota
+. ./common/rc
+. ./common/filter
+. ./common/quota
 
 echo "Silence is golden."
 
diff --git a/tests/xfs/262 b/tests/xfs/262
index 8ced43f6f..2b41a86ac 100755
--- a/tests/xfs/262
+++ b/tests/xfs/262
@@ -54,9 +54,9 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.quota
+. ./common/rc
+. ./common/filter
+. ./common/quota
 
 echo "Silence is golden."
 
diff --git a/tests/xfs/266 b/tests/xfs/266
index 41154b765..e55a4d31b 100755
--- a/tests/xfs/266
+++ b/tests/xfs/266
@@ -44,8 +44,8 @@ _add_and_append_dumpdir_fill()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.dump
+. ./common/rc
+. ./common/dump
 
 # real QA test starts here
 _supported_fs xfs
diff --git a/tests/xfs/267 b/tests/xfs/267
index 092082565..1b6004021 100755
--- a/tests/xfs/267
+++ b/tests/xfs/267
@@ -53,9 +53,9 @@ End-of-File
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.dump
-. ./common.attr
+. ./common/rc
+. ./common/dump
+. ./common/attr
 
 # real QA test starts here
 _supported_fs xfs
diff --git a/tests/xfs/268 b/tests/xfs/268
index 00a552991..700a0793a 100755
--- a/tests/xfs/268
+++ b/tests/xfs/268
@@ -56,9 +56,9 @@ End-of-File
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.dump
-. ./common.attr
+. ./common/rc
+. ./common/dump
+. ./common/attr
 
 # real QA test starts here
 _supported_fs xfs
diff --git a/tests/xfs/278 b/tests/xfs/278
index 4e3bbe26a..765be1cd5 100755
--- a/tests/xfs/278
+++ b/tests/xfs/278
@@ -42,8 +42,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs xfs
diff --git a/tests/xfs/279 b/tests/xfs/279
index cf6bec38f..f89b8fa7a 100755
--- a/tests/xfs/279
+++ b/tests/xfs/279
@@ -41,9 +41,9 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.scsi_debug
+. ./common/rc
+. ./common/filter
+. ./common/scsi_debug
 
 # real QA test starts here
 _supported_fs xfs
diff --git a/tests/xfs/281 b/tests/xfs/281
index 3a8a85421..d3dfca145 100755
--- a/tests/xfs/281
+++ b/tests/xfs/281
@@ -34,8 +34,8 @@ status=1	# failure is the default!
 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.dump
+. ./common/rc
+. ./common/dump
 
 # real QA test starts here
 _supported_fs xfs
diff --git a/tests/xfs/282 b/tests/xfs/282
index f57d89ebf..2b9f124fc 100755
--- a/tests/xfs/282
+++ b/tests/xfs/282
@@ -36,8 +36,8 @@ status=1	# failure is the default!
 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.dump
+. ./common/rc
+. ./common/dump
 
 # real QA test starts here
 _supported_fs xfs
diff --git a/tests/xfs/283 b/tests/xfs/283
index e57701b92..bdc4a5cf4 100755
--- a/tests/xfs/283
+++ b/tests/xfs/283
@@ -36,8 +36,8 @@ status=1	# failure is the default!
 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.dump
+. ./common/rc
+. ./common/dump
 
 # real QA test starts here
 _supported_fs xfs
diff --git a/tests/xfs/287 b/tests/xfs/287
index 49eb475e6..5247de392 100644
--- a/tests/xfs/287
+++ b/tests/xfs/287
@@ -35,8 +35,8 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 rm -f $seqres.full
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.quota
+. ./common/rc
+. ./common/quota
 
 _cleanup()
 {
diff --git a/tests/xfs/290 b/tests/xfs/290
index 2a8f138d8..5ac68d7e4 100644
--- a/tests/xfs/290
+++ b/tests/xfs/290
@@ -38,8 +38,8 @@ status=1	# failure is the default!
 trap "exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 
diff --git a/tests/xfs/291 b/tests/xfs/291
index 03c34eb17..6a84fda96 100644
--- a/tests/xfs/291
+++ b/tests/xfs/291
@@ -39,8 +39,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 _supported_fs xfs
 _supported_os IRIX Linux
diff --git a/tests/xfs/292 b/tests/xfs/292
index b129965c4..4b3de5fbe 100644
--- a/tests/xfs/292
+++ b/tests/xfs/292
@@ -40,8 +40,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 
diff --git a/tests/xfs/293 b/tests/xfs/293
index 922f819bb..c69dbcfec 100644
--- a/tests/xfs/293
+++ b/tests/xfs/293
@@ -39,8 +39,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 
diff --git a/tests/xfs/295 b/tests/xfs/295
index af8cf386b..7e4e9446a 100644
--- a/tests/xfs/295
+++ b/tests/xfs/295
@@ -39,8 +39,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 
diff --git a/tests/xfs/296 b/tests/xfs/296
index a8530f16d..1cd50a2f9 100644
--- a/tests/xfs/296
+++ b/tests/xfs/296
@@ -39,9 +39,9 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.dump
+. ./common/rc
+. ./common/filter
+. ./common/dump
 
 # real QA test starts here
 
diff --git a/tests/xfs/297 b/tests/xfs/297
index c01046bd5..e1f93c7b5 100644
--- a/tests/xfs/297
+++ b/tests/xfs/297
@@ -41,8 +41,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs xfs