X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Ftests%2Fsanity.sh;h=1ebc64dd3e19dec86f7f000660d72375c744ff3a;hp=e37c7f371351507cc25d1c59e5e92bf595198f8f;hb=e607bf4fefad5c0f34d84da5dc38fb5767edf785;hpb=7cbd1b0c7409b4bfb44dc6869afc4ff9c90a7dce

diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh
index e37c7f3..1ebc64d 100644
--- a/lustre/tests/sanity.sh
+++ b/lustre/tests/sanity.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+# -*- tab-width: 4; indent-tabs-mode: t; -*-
 #
 # Run select tests by setting ONLY, or as arguments to the script.
 # Skip specific tests by setting EXCEPT.
@@ -11,6 +12,11 @@ ONLY=${ONLY:-"$*"}
 ALWAYS_EXCEPT="                27u   42a  42b  42c  42d  45   51d   68b   $SANITY_EXCEPT"
 # UPDATE THE COMMENT ABOVE WITH BUG NUMBERS WHEN CHANGING ALWAYS_EXCEPT!
 
+# with LOD/OSP landing
+# bug number for skipped tests: LU-2036
+ALWAYS_EXCEPT="                 76     $ALWAYS_EXCEPT"
+
+
 # Tests that fail on uml
 CPU=`awk '/model/ {print $4}' /proc/cpuinfo`
 #                                    buffer i/o errs             sock spc runas
@@ -42,6 +48,7 @@ UMOUNT=${UMOUNT:-"umount -d"}
 STRIPES_PER_OBJ=-1
 CHECK_GRANT=${CHECK_GRANT:-"yes"}
 GRANT_CHECK_LIST=${GRANT_CHECK_LIST:-""}
+export PARALLEL=${PARALLEL:-"no"}
 
 export NAME=${NAME:-local}
 
@@ -149,285 +156,287 @@ test_0c() {
 run_test 0c "check import proc ============================="
 
 test_1a() {
-	mkdir $DIR/d1
-	mkdir $DIR/d1/d2
-	mkdir $DIR/d1/d2 && error "we expect EEXIST, but not returned"
-	$CHECKSTAT -t dir $DIR/d1/d2 || error
+	test_mkdir -p $DIR/$tdir
+	test_mkdir -p $DIR/$tdir/d2
+	test_mkdir $DIR/$tdir/d2 && error "we expect EEXIST, but not returned"
+	$CHECKSTAT -t dir $DIR/$tdir/d2 || error
 }
 run_test 1a "mkdir .../d1; mkdir .../d1/d2 ====================="
 
 test_1b() {
-	rmdir $DIR/d1/d2
-	rmdir $DIR/d1
-	$CHECKSTAT -a $DIR/d1 || error
+	rmdir $DIR/$tdir/d2
+	rmdir $DIR/$tdir
+	$CHECKSTAT -a $DIR/$tdir || error
 }
 run_test 1b "rmdir .../d1/d2; rmdir .../d1 ====================="
 
 test_2a() {
-	mkdir $DIR/d2
-	touch $DIR/d2/f
-	$CHECKSTAT -t file $DIR/d2/f || error
+	test_mkdir $DIR/$tdir
+	touch $DIR/$tdir/$tfile
+	$CHECKSTAT -t file $DIR/$tdir/$tfile || error
 }
 run_test 2a "mkdir .../d2; touch .../d2/f ======================"
 
 test_2b() {
-	rm -r $DIR/d2
-	$CHECKSTAT -a $DIR/d2 || error
+	rm -r $DIR/$tdir
+	$CHECKSTAT -a $DIR/$tdir || error
 }
 run_test 2b "rm -r .../d2; checkstat .../d2/f ======================"
 
 test_3a() {
-	mkdir $DIR/d3
-	$CHECKSTAT -t dir $DIR/d3 || error
+	test_mkdir -p $DIR/$tdir
+	$CHECKSTAT -t dir $DIR/$tdir || error
 }
 run_test 3a "mkdir .../d3 ======================================"
 
 test_3b() {
-	if [ ! -d $DIR/d3 ]; then
-		mkdir $DIR/d3
+	if [ ! -d $DIR/$tdir ]; then
+		mkdir $DIR/$tdir
 	fi
-	touch $DIR/d3/f
-	$CHECKSTAT -t file $DIR/d3/f || error
+	touch $DIR/$tdir/$tfile
+	$CHECKSTAT -t file $DIR/$tdir/$tfile || error
 }
 run_test 3b "touch .../d3/f ===================================="
 
 test_3c() {
-	rm -r $DIR/d3
-	$CHECKSTAT -a $DIR/d3 || error
+	rm -r $DIR/$tdir
+	$CHECKSTAT -a $DIR/$tdir || error
 }
 run_test 3c "rm -r .../d3 ======================================"
 
 test_4a() {
-	mkdir $DIR/d4
-	$CHECKSTAT -t dir $DIR/d4 || error
+	test_mkdir -p $DIR/$tdir
+	$CHECKSTAT -t dir $DIR/$tdir || error
 }
 run_test 4a "mkdir .../d4 ======================================"
 
 test_4b() {
-	if [ ! -d $DIR/d4 ]; then
-		mkdir $DIR/d4
+	if [ ! -d $DIR/$tdir ]; then
+		test_mkdir $DIR/$tdir
 	fi
-	mkdir $DIR/d4/d2
-	$CHECKSTAT -t dir $DIR/d4/d2 || error
+	test_mkdir $DIR/$tdir/d2
+	mkdir $DIR/$tdir/d2
+	$CHECKSTAT -t dir $DIR/$tdir/d2 || error
 }
 run_test 4b "mkdir .../d4/d2 ==================================="
 
 test_5() {
-	mkdir $DIR/d5
-	mkdir $DIR/d5/d2
-	chmod 0707 $DIR/d5/d2
-	$CHECKSTAT -t dir -p 0707 $DIR/d5/d2 || error
+	test_mkdir $DIR/$tdir
+	test_mkdir $DIR/$tdir/d2
+	chmod 0707 $DIR/$tdir/d2
+	$CHECKSTAT -t dir -p 0707 $DIR/$tdir/d2 || error
 }
 run_test 5 "mkdir .../d5 .../d5/d2; chmod .../d5/d2 ============"
 
 test_6a() {
-	touch $DIR/f6a
-	chmod 0666 $DIR/f6a || error
-	$CHECKSTAT -t file -p 0666 -u \#$UID $DIR/f6a || error
+	touch $DIR/$tfile
+	chmod 0666 $DIR/$tfile || error
+	$CHECKSTAT -t file -p 0666 -u \#$UID $DIR/$tfile || error
 }
 run_test 6a "touch .../f6a; chmod .../f6a ======================"
 
 test_6b() {
-	[ $RUNAS_ID -eq $UID ] && skip_env "RUNAS_ID = UID = $UID -- skipping" && return
-	if [ ! -f $DIR/f6a ]; then
-		touch $DIR/f6a
-		chmod 0666 $DIR/f6a
+	[ $RUNAS_ID -eq $UID ] && skip_env "RUNAS_ID = UID = $UID" && return
+	if [ ! -f $DIR/$tfile ]; then
+		touch $DIR/$tfile
+		chmod 0666 $DIR/$tfile
 	fi
-	$RUNAS chmod 0444 $DIR/f6a && error
-	$CHECKSTAT -t file -p 0666 -u \#$UID $DIR/f6a || error
+	$RUNAS chmod 0444 $DIR/$tfile && error
+	$CHECKSTAT -t file -p 0666 -u \#$UID $DIR/$tfile || error
 }
 run_test 6b "$RUNAS chmod .../f6a (should return error) =="
 
 test_6c() {
-	[ $RUNAS_ID -eq $UID ] && skip_env "RUNAS_ID = UID = $UID -- skipping" && return
-	touch $DIR/f6c
-	chown $RUNAS_ID $DIR/f6c || error
-	$CHECKSTAT -t file -u \#$RUNAS_ID $DIR/f6c || error
+	[ $RUNAS_ID -eq $UID ] && skip_env "RUNAS_ID = UID = $UID" && return
+	touch $DIR/$tfile
+	chown $RUNAS_ID $DIR/$tfile || error
+	$CHECKSTAT -t file -u \#$RUNAS_ID $DIR/$tfile || error
 }
 run_test 6c "touch .../f6c; chown .../f6c ======================"
 
 test_6d() {
-	[ $RUNAS_ID -eq $UID ] && skip_env "RUNAS_ID = UID = $UID -- skipping" && return
-	if [ ! -f $DIR/f6c ]; then
-		touch $DIR/f6c
-		chown $RUNAS_ID $DIR/f6c
+	[ $RUNAS_ID -eq $UID ] && skip_env "RUNAS_ID = UID = $UID" && return
+	if [ ! -f $DIR/$tfile ]; then
+		touch $DIR/$tfile
+		chown $RUNAS_ID $DIR/$tfile
 	fi
-	$RUNAS chown $UID $DIR/f6c && error
-	$CHECKSTAT -t file -u \#$RUNAS_ID $DIR/f6c || error
+	$RUNAS chown $UID $DIR/$tfile && error
+	$CHECKSTAT -t file -u \#$RUNAS_ID $DIR/$tfile || error
 }
 run_test 6d "$RUNAS chown .../f6c (should return error) =="
 
 test_6e() {
-	[ $RUNAS_ID -eq $UID ] && skip_env "RUNAS_ID = UID = $UID -- skipping" && return
-	touch $DIR/f6e
-	chgrp $RUNAS_ID $DIR/f6e || error
-	$CHECKSTAT -t file -u \#$UID -g \#$RUNAS_ID $DIR/f6e || error
+	[ $RUNAS_ID -eq $UID ] && skip_env "RUNAS_ID = UID = $UID" && return
+	touch $DIR/$tfile
+	chgrp $RUNAS_ID $DIR/$tfile || error
+	$CHECKSTAT -t file -u \#$UID -g \#$RUNAS_ID $DIR/$tfile || error
 }
 run_test 6e "touch .../f6e; chgrp .../f6e ======================"
 
 test_6f() {
-	[ $RUNAS_ID -eq $UID ] && skip_env "RUNAS_ID = UID = $UID -- skipping" && return
-	if [ ! -f $DIR/f6e ]; then
-		touch $DIR/f6e
-		chgrp $RUNAS_ID $DIR/f6e
+	[ $RUNAS_ID -eq $UID ] && skip_env "RUNAS_ID = UID = $UID" && return
+	if [ ! -f $DIR/$tfile ]; then
+		touch $DIR/$tfile
+		chgrp $RUNAS_ID $DIR/$tfile
 	fi
-	$RUNAS chgrp $UID $DIR/f6e && error
-	$CHECKSTAT -t file -u \#$UID -g \#$RUNAS_ID $DIR/f6e || error
+	$RUNAS chgrp $UID $DIR/$tfile && error
+	$CHECKSTAT -t file -u \#$UID -g \#$RUNAS_ID $DIR/$tfile || error
 }
 run_test 6f "$RUNAS chgrp .../f6e (should return error) =="
 
 test_6g() {
-	[ $RUNAS_ID -eq $UID ] && skip_env "RUNAS_ID = UID = $UID -- skipping" && return
-        mkdir $DIR/d6g || error
-        chmod 777 $DIR/d6g || error
-        $RUNAS mkdir $DIR/d6g/d || error
-        chmod g+s $DIR/d6g/d || error
-        mkdir $DIR/d6g/d/subdir
-	$CHECKSTAT -g \#$RUNAS_GID $DIR/d6g/d/subdir || error
+	[ $RUNAS_ID -eq $UID ] && skip_env "RUNAS_ID = UID = $UID" && return
+	test_mkdir $DIR/$tdir || error
+        chmod 777 $DIR/$tdir || error
+        $RUNAS mkdir $DIR/$tdir/d || error
+        chmod g+s $DIR/$tdir/d || error
+        test_mkdir $DIR/$tdir/d/subdir
+	$CHECKSTAT -g \#$RUNAS_GID $DIR/$tdir/d/subdir || error
 }
 run_test 6g "Is new dir in sgid dir inheriting group?"
 
 test_6h() { # bug 7331
-	[ $RUNAS_ID -eq $UID ] && skip_env "RUNAS_ID = UID = $UID -- skipping" && return
-	touch $DIR/f6h || error "touch failed"
-	chown $RUNAS_ID:$RUNAS_GID $DIR/f6h || error "initial chown failed"
-	$RUNAS -G$RUNAS_GID chown $RUNAS_ID:0 $DIR/f6h && error "chown worked"
-	$CHECKSTAT -t file -u \#$RUNAS_ID -g \#$RUNAS_GID $DIR/f6h || error
+	[ $RUNAS_ID -eq $UID ] && skip_env "RUNAS_ID = UID = $UID" && return
+	touch $DIR/$tfile || error "touch failed"
+	chown $RUNAS_ID:$RUNAS_GID $DIR/$tfile || error "initial chown failed"
+	$RUNAS -G$RUNAS_GID chown $RUNAS_ID:0 $DIR/$tfile &&
+		error "chown worked"
+	$CHECKSTAT -t file -u \#$RUNAS_ID -g \#$RUNAS_GID $DIR/$tfile || error
 }
 run_test 6h "$RUNAS chown RUNAS_ID.0 .../f6h (should return error)"
 
 test_7a() {
-	mkdir $DIR/d7
-	$MCREATE $DIR/d7/f
-	chmod 0666 $DIR/d7/f
-	$CHECKSTAT -t file -p 0666 $DIR/d7/f || error
+	test_mkdir $DIR/$tdir
+	$MCREATE $DIR/$tdir/$tfile
+	chmod 0666 $DIR/$tdir/$tfile
+	$CHECKSTAT -t file -p 0666 $DIR/$tdir/$tfile || error
 }
 run_test 7a "mkdir .../d7; mcreate .../d7/f; chmod .../d7/f ===="
 
 test_7b() {
-	if [ ! -d $DIR/d7 ]; then
-		mkdir $DIR/d7
+	if [ ! -d $DIR/$tdir ]; then
+		mkdir $DIR/$tdir
 	fi
-	$MCREATE $DIR/d7/f2
-	echo -n foo > $DIR/d7/f2
-	[ "`cat $DIR/d7/f2`" = "foo" ] || error
-	$CHECKSTAT -t file -s 3 $DIR/d7/f2 || error
+	$MCREATE $DIR/$tdir/$tfile
+	echo -n foo > $DIR/$tdir/$tfile
+	[ "`cat $DIR/$tdir/$tfile`" = "foo" ] || error
+	$CHECKSTAT -t file -s 3 $DIR/$tdir/$tfile || error
 }
 run_test 7b "mkdir .../d7; mcreate d7/f2; echo foo > d7/f2 ====="
 
 test_8() {
-	mkdir $DIR/d8
-	touch $DIR/d8/f
-	chmod 0666 $DIR/d8/f
-	$CHECKSTAT -t file -p 0666 $DIR/d8/f || error
+	test_mkdir $DIR/$tdir
+	touch $DIR/$tdir/$tfile
+	chmod 0666 $DIR/$tdir/$tfile
+	$CHECKSTAT -t file -p 0666 $DIR/$tdir/$tfile || error
 }
 run_test 8 "mkdir .../d8; touch .../d8/f; chmod .../d8/f ======="
 
 test_9() {
-	mkdir $DIR/d9
-	mkdir $DIR/d9/d2
-	mkdir $DIR/d9/d2/d3
-	$CHECKSTAT -t dir $DIR/d9/d2/d3 || error
+	test_mkdir $DIR/$tdir
+	test_mkdir $DIR/$tdir/d2
+	test_mkdir $DIR/$tdir/d2/d3
+	$CHECKSTAT -t dir $DIR/$tdir/d2/d3 || error
 }
 run_test 9 "mkdir .../d9 .../d9/d2 .../d9/d2/d3 ================"
 
 test_10() {
-	mkdir $DIR/d10
-	mkdir $DIR/d10/d2
-	touch $DIR/d10/d2/f
-	$CHECKSTAT -t file $DIR/d10/d2/f || error
+	test_mkdir $DIR/$tdir
+	test_mkdir $DIR/$tdir/d2
+	touch $DIR/$tdir/d2/$tfile
+	$CHECKSTAT -t file $DIR/$tdir/d2/$tfile || error
 }
 run_test 10 "mkdir .../d10 .../d10/d2; touch .../d10/d2/f ======"
 
 test_11() {
-	mkdir $DIR/d11
-	mkdir $DIR/d11/d2
-	chmod 0666 $DIR/d11/d2
-	chmod 0705 $DIR/d11/d2
-	$CHECKSTAT -t dir -p 0705 $DIR/d11/d2 || error
+	test_mkdir $DIR/$tdir
+	test_mkdir $DIR/$tdir/d2
+	chmod 0666 $DIR/$tdir/d2
+	chmod 0705 $DIR/$tdir/d2
+	$CHECKSTAT -t dir -p 0705 $DIR/$tdir/d2 || error
 }
 run_test 11 "mkdir .../d11 d11/d2; chmod .../d11/d2 ============"
 
 test_12() {
-	mkdir $DIR/d12
-	touch $DIR/d12/f
-	chmod 0666 $DIR/d12/f
-	chmod 0654 $DIR/d12/f
-	$CHECKSTAT -t file -p 0654 $DIR/d12/f || error
+	test_mkdir $DIR/$tdir
+	touch $DIR/$tdir/$tfile
+	chmod 0666 $DIR/$tdir/$tfile
+	chmod 0654 $DIR/$tdir/$tfile
+	$CHECKSTAT -t file -p 0654 $DIR/$tdir/$tfile || error
 }
 run_test 12 "touch .../d12/f; chmod .../d12/f .../d12/f ========"
 
 test_13() {
-	mkdir $DIR/d13
-	dd if=/dev/zero of=$DIR/d13/f count=10
-	>  $DIR/d13/f
-	$CHECKSTAT -t file -s 0 $DIR/d13/f || error
+	test_mkdir $DIR/$tdir
+	dd if=/dev/zero of=$DIR/$tdir/$tfile count=10
+	>  $DIR/$tdir/$tfile
+	$CHECKSTAT -t file -s 0 $DIR/$tdir/$tfile || error
 }
 run_test 13 "creat .../d13/f; dd .../d13/f; > .../d13/f ========"
 
 test_14() {
-	mkdir $DIR/d14
-	touch $DIR/d14/f
-	rm $DIR/d14/f
-	$CHECKSTAT -a $DIR/d14/f || error
+	test_mkdir $DIR/$tdir
+	touch $DIR/$tdir/$tfile
+	rm $DIR/$tdir/$tfile
+	$CHECKSTAT -a $DIR/$tdir/$tfile || error
 }
 run_test 14 "touch .../d14/f; rm .../d14/f; rm .../d14/f ======="
 
 test_15() {
-	mkdir $DIR/d15
-	touch $DIR/d15/f
-	mv $DIR/d15/f $DIR/d15/f2
-	$CHECKSTAT -t file $DIR/d15/f2 || error
+	test_mkdir $DIR/$tdir
+	touch $DIR/$tdir/$tfile
+	mv $DIR/$tdir/$tfile $DIR/$tdir/${tfile}_2
+	$CHECKSTAT -t file $DIR/$tdir/${tfile}_2 || error
 }
 run_test 15 "touch .../d15/f; mv .../d15/f .../d15/f2 =========="
 
 test_16() {
-	mkdir $DIR/d16
-	touch $DIR/d16/f
-	rm -rf $DIR/d16/f
-	$CHECKSTAT -a $DIR/d16/f || error
+	test_mkdir $DIR/$tdir
+	touch $DIR/$tdir/$tfile
+	rm -rf $DIR/$tdir/$tfile
+	$CHECKSTAT -a $DIR/$tdir/$tfile || error
 }
 run_test 16 "touch .../d16/f; rm -rf .../d16/f ================="
 
 test_17a() {
-	mkdir -p $DIR/d17
-	touch $DIR/d17/f
-	ln -s $DIR/d17/f $DIR/d17/l-exist
-	ls -l $DIR/d17
-	$CHECKSTAT -l $DIR/d17/f $DIR/d17/l-exist || error
-	$CHECKSTAT -f -t f $DIR/d17/l-exist || error
-	rm -f $DIR/d17/l-exist
-	$CHECKSTAT -a $DIR/d17/l-exist || error
+	test_mkdir -p $DIR/$tdir
+	touch $DIR/$tdir/$tfile
+	ln -s $DIR/$tdir/$tfile $DIR/$tdir/l-exist
+	ls -l $DIR/$tdir
+	$CHECKSTAT -l $DIR/$tdir/$tfile $DIR/$tdir/l-exist || error
+	$CHECKSTAT -f -t f $DIR/$tdir/l-exist || error
+	rm -f $DIR/$tdir/l-exist
+	$CHECKSTAT -a $DIR/$tdir/l-exist || error
 }
 run_test 17a "symlinks: create, remove (real) =================="
 
 test_17b() {
-	mkdir -p $DIR/d17
-	ln -s no-such-file $DIR/d17/l-dangle
-	ls -l $DIR/d17
-	$CHECKSTAT -l no-such-file $DIR/d17/l-dangle || error
-	$CHECKSTAT -fa $DIR/d17/l-dangle || error
-	rm -f $DIR/d17/l-dangle
-	$CHECKSTAT -a $DIR/d17/l-dangle || error
+	test_mkdir -p $DIR/$tdir
+	ln -s no-such-file $DIR/$tdir/l-dangle
+	ls -l $DIR/$tdir
+	$CHECKSTAT -l no-such-file $DIR/$tdir/l-dangle || error
+	$CHECKSTAT -fa $DIR/$tdir/l-dangle || error
+	rm -f $DIR/$tdir/l-dangle
+	$CHECKSTAT -a $DIR/$tdir/l-dangle || error
 }
 run_test 17b "symlinks: create, remove (dangling) =============="
 
 test_17c() { # bug 3440 - don't save failed open RPC for replay
-	mkdir -p $DIR/d17
-	ln -s foo $DIR/d17/f17c
-	cat $DIR/d17/f17c && error "opened non-existent symlink" || true
+	test_mkdir -p $DIR/$tdir
+	ln -s foo $DIR/$tdir/$tfile
+	cat $DIR/$tdir/$tfile && error "opened non-existent symlink" || true
 }
 run_test 17c "symlinks: open dangling (should return error) ===="
 
 test_17d() {
-	mkdir -p $DIR/d17
-	ln -s foo $DIR/d17/f17d
-	touch $DIR/d17/f17d || error "creating to new symlink"
+	test_mkdir -p $DIR/$tdir
+	ln -s foo $DIR/$tdir/$tfile
+	touch $DIR/$tdir/$tfile || error "creating to new symlink"
 }
 run_test 17d "symlinks: create dangling ========================"
 
 test_17e() {
-	mkdir -p $DIR/$tdir
+	test_mkdir -p $DIR/$tdir
 	local foo=$DIR/$tdir/$tfile
 	ln -s $foo $foo || error "create symlink failed"
 	ls -l $foo || error "ls -l failed"
@@ -436,7 +445,7 @@ test_17e() {
 run_test 17e "symlinks: create recursive symlink (should return error) ===="
 
 test_17f() {
-	mkdir -p $DIR/d17f
+	test_mkdir -p $DIR/d17f
 	ln -s 1234567890/2234567890/3234567890/4234567890 $DIR/d17f/111
 	ln -s 1234567890/2234567890/3234567890/4234567890/5234567890/6234567890 $DIR/d17f/222
 	ln -s 1234567890/2234567890/3234567890/4234567890/5234567890/6234567890/7234567890/8234567890 $DIR/d17f/333
@@ -447,31 +456,61 @@ test_17f() {
 }
 run_test 17f "symlinks: long and very long symlink name ========================"
 
+# str_repeat(S, N) generate a string that is string S repeated N times
+str_repeat() {
+	local s=$1
+	local n=$2
+	local ret=''
+	while [ $((n -= 1)) -ge 0 ]; do
+		ret=$ret$s
+	done
+	echo $ret
+}
+
+# Long symlinks and LU-2241
 test_17g() {
-        mkdir -p $DIR/$tdir
-        LONGSYMLINK="$(dd if=/dev/zero bs=4095 count=1 | tr '\0' 'x')"
-        ln -s $LONGSYMLINK $DIR/$tdir/$tfile
-        ls -l $DIR/$tdir
+        test_mkdir -p $DIR/$tdir
+	local TESTS="59 60 61 4094 4095"
+
+	for i in $TESTS; do
+		local SYMNAME=$(str_repeat 'x' $i)
+		ln -s $SYMNAME $DIR/$tdir/f$i || error "failed $i-char symlink"
+		readlink $DIR/$tdir/f$i	|| error "failed $i-char readlink"
+	done
 }
-run_test 17g "symlinks: really long symlink name ==============================="
+run_test 17g "symlinks: really long symlink name and inode boundaries"
 
 test_17h() { #bug 17378
-        remote_mds_nodsh && skip "remote MDS with nodsh" && return
-        mkdir -p $DIR/$tdir
+	remote_mds_nodsh && skip "remote MDS with nodsh" && return
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
+	local mdt_idx
+        test_mkdir -p $DIR/$tdir
+	if [ $MDSCOUNT -gt 1 ]; then
+		mdt_idx=$($LFS getdirstripe -i $DIR/$tdir)
+	else
+		mdt_idx=0
+	fi
         $SETSTRIPE -c -1 $DIR/$tdir
 #define OBD_FAIL_MDS_LOV_PREP_CREATE 0x141
-        do_facet $SINGLEMDS lctl set_param fail_loc=0x80000141
+        do_facet mds$((mdt_idx + 1)) lctl set_param fail_loc=0x80000141
         touch $DIR/$tdir/$tfile || true
 }
 run_test 17h "create objects: lov_free_memmd() doesn't lbug"
 
 test_17i() { #bug 20018
-        remote_mds_nodsh && skip "remote MDS with nodsh" && return
-        mkdir -p $DIR/$tdir
+	remote_mds_nodsh && skip "remote MDS with nodsh" && return
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
+	test_mkdir -p $DIR/$tdir
 	local foo=$DIR/$tdir/$tfile
+	local mdt_idx
+	if [ $MDSCOUNT -gt 1 ]; then
+		mdt_idx=$($LFS getdirstripe -i $DIR/$tdir)
+	else
+		mdt_idx=0
+	fi
 	ln -s $foo $foo || error "create symlink failed"
 #define OBD_FAIL_MDS_READLINK_EPROTO     0x143
-	do_facet $SINGLEMDS lctl set_param fail_loc=0x80000143
+	do_facet mds$((mdt_idx + 1)) lctl set_param fail_loc=0x80000143
 	ls -l $foo && error "error not detected"
 	return 0
 }
@@ -480,7 +519,9 @@ run_test 17i "don't panic on short symlink"
 test_17k() { #bug 22301
         rsync --help | grep -q xattr ||
                 skip_env "$(rsync --version| head -1) does not support xattrs"
-        mkdir -p $DIR/{$tdir,$tdir.new}
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
+        test_mkdir -p $DIR/$tdir
+	test_mkdir -p $DIR/$tdir.new
         touch $DIR/$tdir/$tfile
         ln -s $DIR/$tdir/$tfile $DIR/$tdir/$tfile.lnk
         rsync -av -X $DIR/$tdir/ $DIR/$tdir.new ||
@@ -488,6 +529,22 @@ test_17k() { #bug 22301
 }
 run_test 17k "symlinks: rsync with xattrs enabled ========================="
 
+test_17l() { # LU-279
+	mkdir -p $DIR/$tdir
+	touch $DIR/$tdir/$tfile
+	ln -s $DIR/$tdir/$tfile $DIR/$tdir/$tfile.lnk
+	for path in "$DIR/$tdir" "$DIR/$tdir/$tfile" "$DIR/$tdir/$tfile.lnk"; do
+		# -h to not follow symlinks. -m '' to list all the xattrs.
+		# grep to remove first line: '# file: $path'.
+		for xattr in `getfattr -hm '' $path 2>/dev/null | grep -v '^#'`;
+		do
+			lgetxattr_size_check $path $xattr ||
+				error "lgetxattr_size_check $path $xattr failed"
+		done
+	done
+}
+run_test 17l "Ensure lgetxattr's returned xattr size is consistent ========"
+
 # LU-1540
 test_17m() {
 	local short_sym="0123456789"
@@ -498,6 +555,15 @@ test_17m() {
 	local i
 	local rc=0
 
+	[ $(lustre_version_code $SINGLEMDS) -ge $(version_code 2.2.0) ] &&
+	[ $(lustre_version_code $SINGLEMDS) -le $(version_code 2.2.93) ] &&
+		skip "MDS 2.2.0-2.2.93 do not NUL-terminate symlinks" && return
+
+	[ "$(facet_fstype $SINGLEMDS)" != "ldiskfs" ] &&
+		skip "only for ldiskfs MDT" && return 0
+
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
+
 	mkdir -p $WDIR
 	long_sym=$short_sym
 	# create a long symlink file
@@ -514,7 +580,7 @@ test_17m() {
 	echo "erase them"
 	rm -f $WDIR/*
 	sync
-	sleep 2
+	wait_delete_completed
 
 	echo "recreate the 512 symlink files with a shorter string"
 	for ((i = 0; i < 512; ++i)); do
@@ -541,6 +607,61 @@ test_17m() {
 }
 run_test 17m "run e2fsck against MDT which contains short/long symlink"
 
+check_fs_consistency_17n() {
+	local mdt_index
+	local devname
+	local cmd
+	local rc=0
+
+	for mdt_index in $(seq 1 $MDSCOUNT); do
+		devname=$(mdsdevname $mdt_index)
+		cmd="$E2FSCK -fnvd $devname"
+
+		echo "stop and checking mds${mdt_index}: $cmd"
+		# e2fsck should not return error
+		stop mds${mdt_index}
+		do_facet mds${mdt_index} $cmd || rc=$?
+
+		start mds${mdt_index} $devname $MDS_MOUNT_OPTS
+		df $MOUNT > /dev/null 2>&1
+		[ $rc -ne 0 ] && break
+	done
+	return $rc
+}
+
+test_17n() {
+	local i
+
+	[ $(lustre_version_code $SINGLEMDS) -ge $(version_code 2.2.0) ] &&
+	[ $(lustre_version_code $SINGLEMDS) -le $(version_code 2.2.93) ] &&
+		skip "MDS 2.2.0-2.2.93 do not NUL-terminate symlinks" && return
+
+	[ "$(facet_fstype $SINGLEMDS)" != "ldiskfs" ] &&
+		skip "only for ldiskfs MDT" && return 0
+
+	[ $MDSCOUNT -lt 2 ] && skip "needs >= 2 MDTs" && return
+
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
+
+	mkdir -p $DIR/$tdir
+	for ((i=0; i<10; i++)); do
+		$LFS mkdir -i 1 $DIR/$tdir/remote_dir_${i} ||
+			error "create remote dir error $i"
+		createmany -o $DIR/$tdir/remote_dir_${i}/f 10 ||
+			error "create files under remote dir failed $i"
+	done
+
+	check_fs_consistency_17n || error "e2fsck report error"
+
+	for ((i=0;i<10;i++)); do
+		rm -rf $DIR/$tdir/remote_dir_${i} ||
+			error "destroy remote dir error $i"
+	done
+
+	check_fs_consistency_17n || error "e2fsck report error"
+}
+run_test 17n "run e2fsck against master/slave MDT which contains remote dir"
+
 test_18() {
 	touch $DIR/f
 	ls $DIR || error
@@ -586,7 +707,7 @@ test_20() {
 run_test 20 "touch .../f ; ls -l ... ==========================="
 
 test_21() {
-	mkdir $DIR/d21
+	test_mkdir $DIR/d21
 	[ -f $DIR/d21/dangle ] && rm -f $DIR/d21/dangle
 	ln -s dangle $DIR/d21/link
 	echo foo >> $DIR/d21/link
@@ -598,7 +719,7 @@ run_test 21 "write to dangling link ============================"
 
 test_22() {
 	WDIR=$DIR/$tdir
-	mkdir -p $WDIR
+	test_mkdir -p $DIR/$tdir
 	chown $RUNAS_ID:$RUNAS_GID $WDIR
 	(cd $WDIR || error "cd $WDIR failed";
 	$RUNAS tar cf - /etc/hosts /etc/sysconfig/network | \
@@ -611,7 +732,7 @@ run_test 22 "unpack tar archive as non-root user ==============="
 
 # was test_23
 test_23a() {
-	mkdir -p $DIR/$tdir
+	test_mkdir -p $DIR/$tdir
 	local file=$DIR/$tdir/$tfile
 
 	openfile -f O_CREAT:O_EXCL $file || error "$file create failed"
@@ -621,7 +742,7 @@ test_23a() {
 run_test 23a "O_CREAT|O_EXCL in subdir =========================="
 
 test_23b() { # bug 18988
-	mkdir -p $DIR/$tdir
+	test_mkdir -p $DIR/$tdir
 	local file=$DIR/$tdir/$tfile
 
         rm -f $file
@@ -635,7 +756,7 @@ run_test 23b "O_APPEND check =========================="
 test_24a() {
 	echo '== rename sanity =============================================='
 	echo '-- same directory rename'
-	mkdir $DIR/R1
+	test_mkdir $DIR/R1
 	touch $DIR/R1/f
 	mv $DIR/R1/f $DIR/R1/g
 	$CHECKSTAT -t file $DIR/R1/g || error
@@ -643,7 +764,7 @@ test_24a() {
 run_test 24a "touch .../R1/f; rename .../R1/f .../R1/g ========="
 
 test_24b() {
-	mkdir $DIR/R2
+	test_mkdir $DIR/R2
 	touch $DIR/R2/{f,g}
 	mv $DIR/R2/f $DIR/R2/g
 	$CHECKSTAT -a $DIR/R2/f || error
@@ -652,8 +773,8 @@ test_24b() {
 run_test 24b "touch .../R2/{f,g}; rename .../R2/f .../R2/g ====="
 
 test_24c() {
-	mkdir $DIR/R3
-	mkdir $DIR/R3/f
+	test_mkdir $DIR/R3
+	test_mkdir $DIR/R3/f
 	mv $DIR/R3/f $DIR/R3/g
 	$CHECKSTAT -a $DIR/R3/f || error
 	$CHECKSTAT -t dir $DIR/R3/g || error
@@ -661,8 +782,9 @@ test_24c() {
 run_test 24c "mkdir .../R3/f; rename .../R3/f .../R3/g ========="
 
 test_24d() {
-	mkdir $DIR/R4
-	mkdir $DIR/R4/{f,g}
+	test_mkdir $DIR/R4
+	test_mkdir $DIR/R4/f
+	test_mkdir $DIR/R4/g
 	mrename $DIR/R4/f $DIR/R4/g
 	$CHECKSTAT -a $DIR/R4/f || error
 	$CHECKSTAT -t dir $DIR/R4/g || error
@@ -671,7 +793,8 @@ run_test 24d "mkdir .../R4/{f,g}; rename .../R4/f .../R4/g ====="
 
 test_24e() {
 	echo '-- cross directory renames --'
-	mkdir $DIR/R5{a,b}
+	test_mkdir $DIR/R5a
+	test_mkdir $DIR/R5b
 	touch $DIR/R5a/f
 	mv $DIR/R5a/f $DIR/R5b/g
 	$CHECKSTAT -a $DIR/R5a/f || error
@@ -680,7 +803,8 @@ test_24e() {
 run_test 24e "touch .../R5a/f; rename .../R5a/f .../R5b/g ======"
 
 test_24f() {
-	mkdir $DIR/R6{a,b}
+	test_mkdir $DIR/R6a
+	test_mkdir $DIR/R6b
 	touch $DIR/R6a/f $DIR/R6b/g
 	mv $DIR/R6a/f $DIR/R6b/g
 	$CHECKSTAT -a $DIR/R6a/f || error
@@ -689,8 +813,9 @@ test_24f() {
 run_test 24f "touch .../R6a/f R6b/g; mv .../R6a/f .../R6b/g ===="
 
 test_24g() {
-	mkdir $DIR/R7{a,b}
-	mkdir $DIR/R7a/d
+	test_mkdir $DIR/R7a
+	test_mkdir $DIR/R7b
+	test_mkdir $DIR/R7a/d
 	mv $DIR/R7a/d $DIR/R7b/e
 	$CHECKSTAT -a $DIR/R7a/d || error
 	$CHECKSTAT -t dir $DIR/R7b/e || error
@@ -698,8 +823,10 @@ test_24g() {
 run_test 24g "mkdir .../R7{a,b}/d; mv .../R7a/d .../R7b/e ======"
 
 test_24h() {
-	mkdir $DIR/R8{a,b}
-	mkdir $DIR/R8a/d $DIR/R8b/e
+	test_mkdir $DIR/R8a
+	test_mkdir $DIR/R8b
+	test_mkdir $DIR/R8a/d
+	test_mkdir $DIR/R8b/e
 	mrename $DIR/R8a/d $DIR/R8b/e
 	$CHECKSTAT -a $DIR/R8a/d || error
 	$CHECKSTAT -t dir $DIR/R8b/e || error
@@ -708,8 +835,8 @@ run_test 24h "mkdir .../R8{a,b}/{d,e}; rename .../R8a/d .../R8b/e"
 
 test_24i() {
 	echo "-- rename error cases"
-	mkdir $DIR/R9
-	mkdir $DIR/R9/a
+	test_mkdir $DIR/R9
+	test_mkdir $DIR/R9/a
 	touch $DIR/R9/f
 	mrename $DIR/R9/f $DIR/R9/a
 	$CHECKSTAT -t file $DIR/R9/f || error
@@ -719,7 +846,7 @@ test_24i() {
 run_test 24i "rename file to dir error: touch f ; mkdir a ; rename f a"
 
 test_24j() {
-	mkdir $DIR/R10
+	test_mkdir $DIR/R10
 	mrename $DIR/R10/f $DIR/R10/g
 	$CHECKSTAT -t dir $DIR/R10 || error
 	$CHECKSTAT -a $DIR/R10/f || error
@@ -728,7 +855,8 @@ test_24j() {
 run_test 24j "source does not exist ============================"
 
 test_24k() {
-	mkdir $DIR/R11a $DIR/R11a/d
+	test_mkdir $DIR/R11a
+	test_mkdir $DIR/R11a/d
 	touch $DIR/R11a/f
 	mv $DIR/R11a/f $DIR/R11a/d
         $CHECKSTAT -a $DIR/R11a/f || error
@@ -766,13 +894,14 @@ run_test 24n "Statting the old file after renaming (Posix rename 2)"
 
 test_24o() {
 	check_kernel_version 37 || return 0
-	mkdir -p $DIR/d24o
+	test_mkdir -p $DIR/d24o
 	rename_many -s random -v -n 10 $DIR/d24o
 }
 run_test 24o "rename of files during htree split ==============="
 
 test_24p() {
-	mkdir $DIR/R12{a,b}
+	test_mkdir $DIR/R12a
+	test_mkdir $DIR/R12b
 	DIRINO=`ls -lid $DIR/R12a | awk '{ print $1 }'`
 	mrename $DIR/R12a $DIR/R12b
 	$CHECKSTAT -a $DIR/R12a || error
@@ -782,24 +911,33 @@ test_24p() {
 }
 run_test 24p "mkdir .../R12{a,b}; rename .../R12a .../R12b"
 
+cleanup_multiop_pause() {
+	trap 0
+	kill -USR1 $MULTIPID
+}
+
 test_24q() {
-	mkdir $DIR/R13{a,b}
-	DIRINO=`ls -lid $DIR/R13a | awk '{ print $1 }'`
-	multiop_bg_pause $DIR/R13b D_c || return 1
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
+	test_mkdir $DIR/R13a
+	test_mkdir $DIR/R13b
+	local DIRINO=$(ls -lid $DIR/R13a | awk '{ print $1 }')
+	multiop_bg_pause $DIR/R13b D_c || error "multiop failed to start"
 	MULTIPID=$!
 
+	trap cleanup_multiop_pause EXIT
 	mrename $DIR/R13a $DIR/R13b
-	$CHECKSTAT -a $DIR/R13a || error
-	$CHECKSTAT -t dir $DIR/R13b || error
-	DIRINO2=`ls -lid $DIR/R13b | awk '{ print $1 }'`
+	$CHECKSTAT -a $DIR/R13a || error "R13a still exists"
+	$CHECKSTAT -t dir $DIR/R13b || error "R13b does not exist"
+	local DIRINO2=$(ls -lid $DIR/R13b | awk '{ print $1 }')
 	[ "$DIRINO" = "$DIRINO2" ] || error "R13a $DIRINO != R13b $DIRINO2"
-	kill -USR1 $MULTIPID
+	cleanup_multiop_pause
 	wait $MULTIPID || error "multiop close failed"
 }
 run_test 24q "mkdir .../R13{a,b}; open R13b rename R13a R13b ==="
 
 test_24r() { #bug 3789
-	mkdir $DIR/R14a $DIR/R14a/b
+	test_mkdir $DIR/R14a
+	test_mkdir $DIR/R14a/b
 	mrename $DIR/R14a $DIR/R14a/b && error "rename to subdir worked!"
 	$CHECKSTAT -t dir $DIR/R14a || error "$DIR/R14a missing"
 	$CHECKSTAT -t dir $DIR/R14a/b || error "$DIR/R14a/b missing"
@@ -807,14 +945,18 @@ test_24r() { #bug 3789
 run_test 24r "mkdir .../R14a/b; rename .../R14a .../R14a/b ====="
 
 test_24s() {
-	mkdir $DIR/R15a $DIR/R15a/b $DIR/R15a/b/c
+	test_mkdir $DIR/R15a
+	test_mkdir $DIR/R15a/b
+	test_mkdir $DIR/R15a/b/c
 	mrename $DIR/R15a $DIR/R15a/b/c && error "rename to sub-subdir worked!"
 	$CHECKSTAT -t dir $DIR/R15a || error "$DIR/R15a missing"
 	$CHECKSTAT -t dir $DIR/R15a/b/c || error "$DIR/R15a/b/c missing"
 }
 run_test 24s "mkdir .../R15a/b/c; rename .../R15a .../R15a/b/c ="
 test_24t() {
-	mkdir $DIR/R16a $DIR/R16a/b $DIR/R16a/b/c
+	test_mkdir $DIR/R16a
+	test_mkdir $DIR/R16a/b
+	test_mkdir $DIR/R16a/b/c
 	mrename $DIR/R16a/b/c $DIR/R16a && error "rename to sub-subdir worked!"
 	$CHECKSTAT -t dir $DIR/R16a || error "$DIR/R16a missing"
 	$CHECKSTAT -t dir $DIR/R16a/b/c || error "$DIR/R16a/b/c missing"
@@ -822,8 +964,9 @@ test_24t() {
 run_test 24t "mkdir .../R16a/b/c; rename .../R16a/b/c .../R16a ="
 
 test_24u() { # bug12192
-        $MULTIOP $DIR/$tfile C2w$((2048 * 1024))c || error
-        $CHECKSTAT -s $((2048 * 1024)) $DIR/$tfile || error "wrong file size"
+	rm -rf $DIR/$tfile
+	$MULTIOP $DIR/$tfile C2w$((2048 * 1024))c || error
+	$CHECKSTAT -s $((2048 * 1024)) $DIR/$tfile || error "wrong file size"
 }
 run_test 24u "create stripe file"
 
@@ -831,20 +974,33 @@ page_size() {
 	getconf PAGE_SIZE
 }
 
+simple_cleanup_common() {
+	trap 0
+	rm -rf $DIR/$tdir
+	wait_delete_completed
+}
+
+max_pages_per_rpc() {
+	$LCTL get_param -n mdc.*.max_pages_per_rpc | head -1
+}
+
 test_24v() {
 	local NRFILES=100000
-	local FREE_INODES=`lfs df -i|grep "filesystem summary" | awk '{print $5}'`
+	local FREE_INODES=$(lfs_df -i | grep "summary" | awk '{print $4}')
 	[ $FREE_INODES -lt $NRFILES ] && \
-		skip "not enough free inodes $FREE_INODES required $NRFILES" && \
+		skip "not enough free inodes $FREE_INODES required $NRFILES" &&
 		return
 
-	mkdir -p $DIR/d24v
-	createmany -m $DIR/d24v/$tfile $NRFILES
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
+	trap simple_cleanup_common EXIT
+
+	mkdir -p $DIR/$tdir
+	createmany -m $DIR/$tdir/$tfile $NRFILES
 
 	cancel_lru_locks mdc
 	lctl set_param mdc.*.stats clear
 
-	ls $DIR/d24v >/dev/null || error "error in listing large dir"
+	ls $DIR/$tdir >/dev/null || error "error in listing large dir"
 
 	# LU-5 large readdir
 	# DIRENT_SIZE = 32 bytes for sizeof(struct lu_dirent) +
@@ -853,14 +1009,14 @@ test_24v() {
 	# take into account of overhead in lu_dirpage header and end mark in
 	# each page, plus one in RPC_NUM calculation.
 	DIRENT_SIZE=48
-	RPC_SIZE=$(($(lctl get_param -n mdc.*.max_pages_per_rpc)*$(page_size)))
+	RPC_SIZE=$(($(max_pages_per_rpc) * $(page_size)))
 	RPC_NUM=$(((NRFILES * DIRENT_SIZE + RPC_SIZE - 1) / RPC_SIZE + 1))
-	mds_readpage=`lctl get_param mdc.*.stats | \
-				awk '/^mds_readpage/ {print $2}'`
+	mds_readpage=$(lctl get_param mdc.*MDT0000*.stats | \
+				awk '/^mds_readpage/ {print $2}')
 	[ $mds_readpage -gt $RPC_NUM ] && \
 		error "large readdir doesn't take effect"
 
-	rm $DIR/d24v -rf
+	simple_cleanup_common
 }
 run_test 24v "list directory with large files (handle hash collision, bug: 17560)"
 
@@ -875,10 +1031,87 @@ test_24w() { # bug21506
 }
 run_test 24w "Reading a file larger than 4Gb"
 
+test_24x() {
+	[ $MDSCOUNT -lt 2 ] && skip "needs >= 2 MDTs" && return
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
+	local MDTIDX=1
+	local remote_dir=$DIR/$tdir/remote_dir
+
+	mkdir -p $DIR/$tdir
+	$LFS mkdir -i $MDTIDX $remote_dir ||
+		error "create remote directory failed"
+
+	mkdir -p $DIR/$tdir/src_dir
+	touch $DIR/$tdir/src_file
+	mkdir -p $remote_dir/tgt_dir
+	touch $remote_dir/tgt_file
+
+	mrename $DIR/$tdir/src_dir $remote_dir/tgt_dir &&
+		error "rename dir cross MDT works!"
+
+	mrename $DIR/$tdir/src_file $remote_dir/tgt_file &&
+		error "rename file cross MDT works!"
+
+	ln $DIR/$tdir/src_file $remote_dir/tgt_file1 &&
+		error "ln file cross MDT should not work!"
+
+	rm -rf $DIR/$tdir || error "Can not delete directories"
+}
+run_test 24x "cross rename/link should be failed"
+
+test_24y() {
+	[ $MDSCOUNT -lt 2 ] && skip "needs >= 2 MDTs" && return
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
+	local MDTIDX=1
+	local remote_dir=$DIR/$tdir/remote_dir
+
+	mkdir -p $DIR/$tdir
+	$LFS mkdir -i $MDTIDX $remote_dir ||
+	           error "create remote directory failed"
+
+	mkdir -p $remote_dir/src_dir
+	touch $remote_dir/src_file
+	mkdir -p $remote_dir/tgt_dir
+	touch $remote_dir/tgt_file
+
+	mrename $remote_dir/src_dir $remote_dir/tgt_dir ||
+		error "rename subdir in the same remote dir failed!"
+
+	mrename $remote_dir/src_file $remote_dir/tgt_file ||
+		error "rename files in the same remote dir failed!"
+
+	ln $remote_dir/tgt_file $remote_dir/tgt_file1 ||
+		error "link files in the same remote dir failed!"
+
+	rm -rf $DIR/$tdir || error "Can not delete directories"
+}
+run_test 24y "rename/link on the same dir should succeed"
+
+test_24z() {
+	[ $MDSCOUNT -lt 2 ] && skip "needs >= 2 MDTs" && return
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
+	local MDTIDX=1
+	local remote_src=$DIR/$tdir/remote_dir
+	local remote_tgt=$DIR/$tdir/remote_tgt
+
+	mkdir -p $DIR/$tdir
+	$LFS mkdir -i $MDTIDX $remote_src ||
+		   error "create remote directory failed"
+
+	$LFS mkdir -i $MDTIDX $remote_tgt ||
+		   error "create remote directory failed"
+
+	mrename $remote_src $remote_tgt &&
+		error "rename remote dirs should not work!"
+
+	rm -rf $DIR/$tdir || error "Can not delete directories"
+}
+run_test 24z "rename one remote dir to another remote dir should fail"
+
 test_25a() {
 	echo '== symlink sanity ============================================='
 
-	mkdir $DIR/d25
+	test_mkdir $DIR/d25
 	ln -s d25 $DIR/s25
 	touch $DIR/s25/foo || error
 }
@@ -891,22 +1124,22 @@ test_25b() {
 run_test 25b "lookup file in symlinked directory ==============="
 
 test_26a() {
-	mkdir $DIR/d26
-	mkdir $DIR/d26/d26-2
+	test_mkdir $DIR/d26
+	test_mkdir $DIR/d26/d26-2
 	ln -s d26/d26-2 $DIR/s26
 	touch $DIR/s26/foo || error
 }
 run_test 26a "multiple component symlink ======================="
 
 test_26b() {
-	mkdir -p $DIR/d26b/d26-2
+	test_mkdir -p $DIR/d26b/d26-2
 	ln -s d26b/d26-2/foo $DIR/s26-2
 	touch $DIR/s26-2 || error
 }
 run_test 26b "multiple component symlink at end of lookup ======"
 
 test_26c() {
-	mkdir $DIR/d26.2
+	test_mkdir $DIR/d26.2
 	touch $DIR/d26.2/foo
 	ln -s d26.2 $DIR/s26.2-1
 	ln -s s26.2-1 $DIR/s26.2-2
@@ -929,11 +1162,11 @@ run_test 26e "unlink multiple component recursive symlink ======"
 
 # recursive symlinks (bug 7022)
 test_26f() {
-	mkdir -p $DIR/$tdir
-	mkdir $DIR/$tdir/$tfile        || error "mkdir $DIR/$tdir/$tfile failed"
+	test_mkdir -p $DIR/$tdir
+	test_mkdir $DIR/$tdir/$tfile   || error "mkdir $DIR/$tdir/$tfile failed"
 	cd $DIR/$tdir/$tfile           || error "cd $DIR/$tdir/$tfile failed"
-	mkdir -p lndir/bar1      || error "mkdir lndir/bar1 failed"
-	mkdir $tfile             || error "mkdir $tfile failed"
+	test_mkdir -p lndir bar1      || error "mkdir lndir/bar1 failed"
+	test_mkdir $DIR/$tdir/$tfile/$tfile   || error "mkdir $tfile failed"
 	cd $tfile                || error "cd $tfile failed"
 	ln -s .. dotdot          || error "ln dotdot failed"
 	ln -s dotdot/lndir lndir || error "ln lndir failed"
@@ -947,7 +1180,7 @@ run_test 26f "rm -r of a directory which has recursive symlink ="
 
 test_27a() {
 	echo '== stripe sanity =============================================='
-	mkdir -p $DIR/d27 || error "mkdir failed"
+	test_mkdir -p $DIR/d27 || error "mkdir failed"
 	$GETSTRIPE $DIR/d27
 	$SETSTRIPE -c 1 $DIR/d27/f0 || error "setstripe failed"
 	$CHECKSTAT -t file $DIR/d27/f0 || error "checkstat failed"
@@ -959,7 +1192,7 @@ run_test 27a "one stripe file =================================="
 
 test_27b() {
 	[ "$OSTCOUNT" -lt "2" ] && skip_env "skipping 2-stripe test" && return
-	mkdir -p $DIR/d27
+	test_mkdir -p $DIR/d27
 	$SETSTRIPE -c 2 $DIR/d27/f01 || error "setstripe failed"
 	$GETSTRIPE -c $DIR/d27/f01
 	[ $($GETSTRIPE -c $DIR/d27/f01) -eq 2 ] ||
@@ -975,7 +1208,7 @@ test_27c() {
 run_test 27c "write to two stripe file"
 
 test_27d() {
-	mkdir -p $DIR/d27
+	test_mkdir -p $DIR/d27
 	$SETSTRIPE -c 0 -i -1 -S 0 $DIR/d27/fdef || error "setstripe failed"
 	$CHECKSTAT -t file $DIR/d27/fdef || error "checkstat failed"
 	dd if=/dev/zero of=$DIR/d27/fdef bs=4k count=4 || error
@@ -983,7 +1216,7 @@ test_27d() {
 run_test 27d "create file with default settings ================"
 
 test_27e() {
-	mkdir -p $DIR/d27
+	test_mkdir -p $DIR/d27
 	$SETSTRIPE -c 2 $DIR/d27/f12 || error "setstripe failed"
 	$SETSTRIPE -c 2 $DIR/d27/f12 && error "setstripe succeeded twice"
 	$CHECKSTAT -t file $DIR/d27/f12 || error "checkstat failed"
@@ -991,7 +1224,7 @@ test_27e() {
 run_test 27e "setstripe existing file (should return error) ======"
 
 test_27f() {
-	mkdir -p $DIR/d27
+	test_mkdir -p $DIR/d27
 	$SETSTRIPE -S 100 -i 0 -c 1 $DIR/d27/fbad && error "setstripe failed"
 	dd if=/dev/zero of=$DIR/d27/f12 bs=4k count=4 || error "dd failed"
 	$GETSTRIPE $DIR/d27/fbad || error "$GETSTRIPE failed"
@@ -999,7 +1232,7 @@ test_27f() {
 run_test 27f "setstripe with bad stripe size (should return error)"
 
 test_27g() {
-	mkdir -p $DIR/d27
+	test_mkdir -p $DIR/d27
 	$MCREATE $DIR/d27/fnone || error "mcreate failed"
 	$GETSTRIPE $DIR/d27/fnone 2>&1 | grep "no stripe info" ||
 		error "$DIR/d27/fnone has object"
@@ -1013,16 +1246,16 @@ test_27i() {
 run_test 27i "$GETSTRIPE with some objects"
 
 test_27j() {
-	mkdir -p $DIR/d27
+	test_mkdir -p $DIR/d27
 	$SETSTRIPE -i $OSTCOUNT $DIR/d27/f27j && error "setstripe failed"||true
 }
 run_test 27j "setstripe with bad stripe offset (should return error)"
 
 test_27k() { # bug 2844
-	mkdir -p $DIR/d27
+	test_mkdir -p $DIR/d27
 	FILE=$DIR/d27/f27k
 	LL_MAX_BLKSIZE=$((4 * 1024 * 1024))
-	[ ! -d $DIR/d27 ] && mkdir -p $DIR/d27
+	[ ! -d $DIR/d27 ] && test_mkdir -p $DIR d27
 	$SETSTRIPE -S 67108864 $FILE || error "setstripe failed"
 	BLKSIZE=`stat $FILE | awk '/IO Block:/ { print $7 }'`
 	[ $BLKSIZE -le $LL_MAX_BLKSIZE ] || error "$BLKSIZE > $LL_MAX_BLKSIZE"
@@ -1033,7 +1266,7 @@ test_27k() { # bug 2844
 run_test 27k "limit i_blksize for broken user apps ============="
 
 test_27l() {
-	mkdir -p $DIR/d27
+	test_mkdir -p $DIR/d27
 	mcreate $DIR/f27l || error "creating file"
 	$RUNAS $SETSTRIPE -c 1 $DIR/f27l && \
 		error "setstripe should have failed" || true
@@ -1041,30 +1274,31 @@ test_27l() {
 run_test 27l "check setstripe permissions (should return error)"
 
 test_27m() {
-	[ "$OSTCOUNT" -lt "2" ] && skip_env "$OSTCOUNT < 2 OSTs -- skipping" && return
+	[ "$OSTCOUNT" -lt "2" ] && skip_env "$OSTCOUNT < 2 OSTs -- skipping" &&
+		return
 	if [ $ORIGFREE -gt $MAXFREE ]; then
 		skip "$ORIGFREE > $MAXFREE skipping out-of-space test on OST0"
 		return
 	fi
-	mkdir -p $DIR/d27
-	$SETSTRIPE -i 0 -c 1 $DIR/d27/f27m_1
-	dd if=/dev/zero of=$DIR/d27/f27m_1 bs=1024 count=$MAXFREE &&
+	trap simple_cleanup_common EXIT
+	test_mkdir -p $DIR/$tdir
+	$SETSTRIPE -i 0 -c 1 $DIR/$tdir/f27m_1
+	dd if=/dev/zero of=$DIR/$tdir/f27m_1 bs=1024 count=$MAXFREE &&
 		error "dd should fill OST0"
 	i=2
-	while $SETSTRIPE -i 0 -c 1 $DIR/d27/f27m_$i; do
+	while $SETSTRIPE -i 0 -c 1 $DIR/$tdir/f27m_$i; do
 		i=`expr $i + 1`
 		[ $i -gt 256 ] && break
 	done
 	i=`expr $i + 1`
-	touch $DIR/d27/f27m_$i
-	[ `$GETSTRIPE $DIR/d27/f27m_$i | grep -A 10 obdidx | awk '{print $1}'| grep -w "0"` ] && \
+	touch $DIR/$tdir/f27m_$i
+	[ `$GETSTRIPE $DIR/$tdir/f27m_$i | grep -A 10 obdidx | awk '{print $1}'| grep -w "0"` ] &&
 		error "OST0 was full but new created file still use it"
 	i=`expr $i + 1`
-	touch $DIR/d27/f27m_$i
-	[ `$GETSTRIPE $DIR/d27/f27m_$i | grep -A 10 obdidx | awk '{print $1}'| grep -w "0"` ] && \
+	touch $DIR/$tdir/f27m_$i
+	[ `$GETSTRIPE $DIR/$tdir/f27m_$i | grep -A 10 obdidx | awk '{print $1}'| grep -w "0"` ] &&
 		error "OST0 was full but new created file still use it"
-	rm -r $DIR/d27
-	sleep 15
+	simple_cleanup_common
 }
 run_test 27m "create file while OST0 was full =================="
 
@@ -1082,6 +1316,7 @@ reset_enospc() {
 	[ "$OSTIDX" ] && list=$(facet_host ost$((OSTIDX + 1)))
 
 	do_nodes $list lctl set_param fail_loc=0
+	sync	# initiate all OST_DESTROYs from MDS to OST
 	sleep_maxage
 }
 
@@ -1090,7 +1325,7 @@ exhaust_precreations() {
 	local FAILLOC=$2
 	local FAILIDX=${3:-$OSTIDX}
 
-	mkdir -p $DIR/$tdir
+	test_mkdir -p $DIR/$tdir
 	local MDSIDX=$(get_mds_dir "$DIR/$tdir")
 	echo OSTIDX=$OSTIDX MDSIDX=$MDSIDX
 
@@ -1108,7 +1343,7 @@ exhaust_precreations() {
 	local mdtosc_proc2=$(get_mdtosc_proc_path mds${MDSIDX})
 	do_facet mds${MDSIDX} lctl get_param osc.$mdtosc_proc2.prealloc*
 
-	mkdir -p $DIR/$tdir/${OST}
+	test_mkdir -p $DIR/$tdir/${OST}
 	$SETSTRIPE -i $OSTIDX -c 1 $DIR/$tdir/${OST}
 #define OBD_FAIL_OST_ENOSPC              0x215
 	do_facet ost$((OSTIDX + 1)) lctl set_param fail_val=$FAILIDX
@@ -1129,6 +1364,7 @@ exhaust_all_precreations() {
 
 test_27n() {
 	[ "$OSTCOUNT" -lt "2" ] && skip_env "too few OSTs" && return
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	remote_mds_nodsh && skip "remote MDS with nodsh" && return
 	remote_ost_nodsh && skip "remote OST with nodsh" && return
 
@@ -1144,6 +1380,7 @@ run_test 27n "create file with some full OSTs =================="
 
 test_27o() {
 	[ "$OSTCOUNT" -lt "2" ] && skip_env "too few OSTs" && return
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	remote_mds_nodsh && skip "remote MDS with nodsh" && return
 	remote_ost_nodsh && skip "remote OST with nodsh" && return
 
@@ -1160,12 +1397,13 @@ run_test 27o "create file with all full OSTs (should error) ===="
 
 test_27p() {
 	[ "$OSTCOUNT" -lt "2" ] && skip_env "too few OSTs" && return
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	remote_mds_nodsh && skip "remote MDS with nodsh" && return
 	remote_ost_nodsh && skip "remote OST with nodsh" && return
 
 	reset_enospc
 	rm -f $DIR/$tdir/$tfile
-	mkdir -p $DIR/$tdir
+	test_mkdir -p $DIR/$tdir
 
 	$MCREATE $DIR/$tdir/$tfile || error "mcreate failed"
 	$TRUNCATE $DIR/$tdir/$tfile 80000000 || error "truncate failed"
@@ -1182,13 +1420,14 @@ run_test 27p "append to a truncated file with some full OSTs ==="
 
 test_27q() {
 	[ "$OSTCOUNT" -lt "2" ] && skip_env "too few OSTs" && return
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	remote_mds_nodsh && skip "remote MDS with nodsh" && return
 	remote_ost_nodsh && skip "remote OST with nodsh" && return
 
 	reset_enospc
 	rm -f $DIR/$tdir/$tfile
 
-	mkdir -p $DIR/$tdir
+	test_mkdir -p $DIR/$tdir
 	$MCREATE $DIR/$tdir/$tfile || error "mcreate $DIR/$tdir/$tfile failed"
 	$TRUNCATE $DIR/$tdir/$tfile 80000000 ||error "truncate $DIR/$tdir/$tfile failed"
 	$CHECKSTAT -s 80000000 $DIR/$tdir/$tfile || error "checkstat failed"
@@ -1204,6 +1443,7 @@ run_test 27q "append to truncated file with all OSTs full (should error) ==="
 
 test_27r() {
 	[ "$OSTCOUNT" -lt "2" ] && skip_env "too few OSTs" && return
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	remote_mds_nodsh && skip "remote MDS with nodsh" && return
 	remote_ost_nodsh && skip "remote OST with nodsh" && return
 
@@ -1218,7 +1458,7 @@ test_27r() {
 run_test 27r "stripe file with some full OSTs (shouldn't LBUG) ="
 
 test_27s() { # bug 10725
-	mkdir -p $DIR/$tdir
+	test_mkdir -p $DIR/$tdir
 	local stripe_size=$((4096 * 1024 * 1024))	# 2^32
 	local stripe_count=0
 	[ $OSTCOUNT -eq 1 ] || stripe_count=2
@@ -1244,7 +1484,7 @@ test_27u() { # bug 4900
 
 #define OBD_FAIL_MDS_OSC_PRECREATE      0x139
         do_facet $SINGLEMDS lctl set_param fail_loc=0x139
-        mkdir -p $DIR/$tdir
+        test_mkdir -p $DIR/$tdir
         createmany -o $DIR/$tdir/t- 1000
         do_facet $SINGLEMDS lctl set_param fail_loc=0
 
@@ -1259,13 +1499,14 @@ run_test 27u "skip object creation on OSC w/o objects =========="
 
 test_27v() { # bug 4900
         [ "$OSTCOUNT" -lt "2" ] && skip_env "too few OSTs" && return
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
         remote_mds_nodsh && skip "remote MDS with nodsh" && return
         remote_ost_nodsh && skip "remote OST with nodsh" && return
 
         exhaust_all_precreations 0x215
         reset_enospc
 
-        mkdir -p $DIR/$tdir
+        test_mkdir -p $DIR/$tdir
         $SETSTRIPE -c 1 $DIR/$tdir         # 1 stripe / file
 
         touch $DIR/$tdir/$tfile
@@ -1288,7 +1529,7 @@ test_27v() { # bug 4900
 run_test 27v "skip object creation on slow OST ================="
 
 test_27w() { # bug 10997
-        mkdir -p $DIR/$tdir || error "mkdir failed"
+        test_mkdir -p $DIR/$tdir || error "mkdir failed"
         $SETSTRIPE -S 65536 $DIR/$tdir/f0 || error "setstripe failed"
         [ $($GETSTRIPE -S $DIR/$tdir/f0) -ne 65536 ] &&
                 error "stripe size $size != 65536" || true
@@ -1301,7 +1542,7 @@ test_27wa() {
         [ "$OSTCOUNT" -lt "2" ] &&
                 skip_env "skipping multiple stripe count/offset test" && return
 
-        mkdir -p $DIR/$tdir || error "mkdir failed"
+        test_mkdir -p $DIR/$tdir || error "mkdir failed"
         for i in $(seq 1 $OSTCOUNT); do
                 offset=$((i - 1))
                 $SETSTRIPE -c $i -i $offset $DIR/$tdir/f$i ||
@@ -1318,11 +1559,12 @@ run_test 27wa "check $SETSTRIPE -c -i options"
 test_27x() {
 	remote_ost_nodsh && skip "remote OST with nodsh" && return
 	[ "$OSTCOUNT" -lt "2" ] && skip_env "$OSTCOUNT < 2 OSTs" && return
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	OFFSET=$(($OSTCOUNT - 1))
 	OSTIDX=0
 	local OST=$(ostname_from_index $OSTIDX)
 
-	mkdir -p $DIR/$tdir
+	test_mkdir -p $DIR/$tdir
 	$SETSTRIPE -c 1 $DIR/$tdir	# 1 stripe per file
 	do_facet ost$((OSTIDX + 1)) lctl set_param -n obdfilter.$OST.degraded 1
 	sleep_maxage
@@ -1339,6 +1581,7 @@ test_27y() {
         [ "$OSTCOUNT" -lt "2" ] && skip_env "$OSTCOUNT < 2 OSTs -- skipping" && return
         remote_mds_nodsh && skip "remote MDS with nodsh" && return
         remote_ost_nodsh && skip "remote OST with nodsh" && return
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 
         local mdtosc=$(get_mdtosc_proc_path $SINGLEMDS $FSNAME-OST0000)
         local last_id=$(do_facet $SINGLEMDS lctl get_param -n \
@@ -1349,37 +1592,53 @@ test_27y() {
         [ $fcount -eq 0 ] && skip "not enough space on OST0" && return
         [ $fcount -gt $OSTCOUNT ] && fcount=$OSTCOUNT
 
-        MDS_OSCS=`do_facet $SINGLEMDS lctl dl | awk '/[oO][sS][cC].*md[ts]/ { print $4 }'`
-        OFFSET=$(($OSTCOUNT-1))
-        OST=-1
-        for OSC in $MDS_OSCS; do
-                if [ $OST == -1 ]; then {
-                        OST=`osc_to_ost $OSC`
-                } else {
-                        echo $OSC "is Deactivate:"
-                        do_facet $SINGLEMDS lctl --device  %$OSC deactivate
-                } fi
-        done
-
-        OSTIDX=$(index_from_ostuuid $OST)
-        mkdir -p $DIR/$tdir
-        $SETSTRIPE -c 1 $DIR/$tdir      # 1 stripe / file
+	local MDS_OSCS=$(do_facet $SINGLEMDS lctl dl |
+			 awk '/[oO][sS][cC].*md[ts]/ { print $4 }')
+	local OST_DEACTIVE_IDX=-1
+	local OSC
+	local OSTIDX
+	local OST
+
+	for OSC in $MDS_OSCS; do
+		OST=$(osc_to_ost $OSC)
+		OSTIDX=$(index_from_ostuuid $OST)
+		if [ $OST_DEACTIVE_IDX == -1 ]; then
+			OST_DEACTIVE_IDX=$OSTIDX
+		fi
+		if [ $OSTIDX != $OST_DEACTIVE_IDX ]; then
+			echo $OSC "is Deactivated:"
+			do_facet $SINGLEMDS lctl --device  %$OSC deactivate
+		fi
+	done
 
-        do_facet ost$((OSTIDX+1)) lctl set_param -n obdfilter.$OST.degraded 1
-        sleep_maxage
-        createmany -o $DIR/$tdir/$tfile $fcount
-        do_facet ost$((OSTIDX+1)) lctl set_param -n obdfilter.$OST.degraded 0
+	OSTIDX=$(index_from_ostuuid $OST)
+	mkdir -p $DIR/$tdir
+	$SETSTRIPE -c 1 $DIR/$tdir      # 1 stripe / file
+
+	for OSC in $MDS_OSCS; do
+		OST=$(osc_to_ost $OSC)
+		OSTIDX=$(index_from_ostuuid $OST)
+		if [ $OSTIDX == $OST_DEACTIVE_IDX ]; then
+			echo $OST "is degraded:"
+			do_facet ost$((OSTIDX+1)) lctl set_param -n \
+						obdfilter.$OST.degraded=1
+		fi
+	done
 
-        for i in `seq 0 $OFFSET`; do
-                [ `$GETSTRIPE $DIR/$tdir/$tfile$i | grep -A 10 obdidx | awk '{print $1}'| grep -w "$OSTIDX"` ] || \
-                      error "files created on deactivated OSTs instead of degraded OST"
-        done
-        for OSC in $MDS_OSCS; do
-                [ `osc_to_ost $OSC` != $OST  ] && {
-                        echo $OSC "is activate"
-                        do_facet $SINGLEMDS lctl --device %$OSC activate
-                }
-        done
+	sleep_maxage
+	createmany -o $DIR/$tdir/$tfile $fcount
+
+	for OSC in $MDS_OSCS; do
+		OST=$(osc_to_ost $OSC)
+		OSTIDX=$(index_from_ostuuid $OST)
+		if [ $OSTIDX == $OST_DEACTIVE_IDX ]; then
+			echo $OST "is recovered from degraded:"
+			do_facet ost$((OSTIDX+1)) lctl set_param -n \
+						obdfilter.$OST.degraded=0
+		else
+			do_facet $SINGLEMDS lctl --device %$OSC activate
+		fi
+	done
 }
 run_test 27y "create files while OST0 is degraded and the rest inactive"
 
@@ -1430,8 +1689,13 @@ check_seq_oid()
                 #       { error "mounting $dev as $FSTYPE failed"; return 3; }
                 #local obj_file=$(do_facet ost$ost find $dir/O/$seq -name $oid)
                 #local ff=$(do_facet ost$ost $LL_DECODE_FILTER_FID $obj_file)
-
-                local obj_file="O/$seq/d$((oid %32))/$oid"
+		seq=$(echo $seq | sed -e "s/^0x//g")
+		if [ $seq == 0 ]; then
+			oid_hex=$(echo $oid)
+		else
+			oid_hex=$(echo $hex | sed -e "s/^0x//g")
+		fi
+                local obj_file="O/$seq/d$((oid %32))/$oid_hex"
                 local ff=$(do_facet ost$ost "$DEBUGFS -c -R 'stat $obj_file' \
                            $dev 2>/dev/null" | grep "parent=")
 
@@ -1464,7 +1728,8 @@ check_seq_oid()
 
 test_27z() {
         remote_ost_nodsh && skip "remote OST with nodsh" && return
-        mkdir -p $DIR/$tdir
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
+        test_mkdir -p $DIR/$tdir
 
         $SETSTRIPE -c 1 -i 0 -S 64k $DIR/$tdir/$tfile-1 ||
                 { error "setstripe -c -1 failed"; return 1; }
@@ -1487,6 +1752,7 @@ test_27z() {
 run_test 27z "check SEQ/OID on the MDT and OST filesystems"
 
 test_27A() { # b=19102
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
         local restore_size=$($GETSTRIPE -S $MOUNT)
         local restore_count=$($GETSTRIPE -c $MOUNT)
         local restore_offset=$($GETSTRIPE -i $MOUNT)
@@ -1506,14 +1772,15 @@ run_test 27A "check filesystem-wide default LOV EA values"
 # createtest also checks that device nodes are created and
 # then visible correctly (#2091)
 test_28() { # bug 2091
-	mkdir $DIR/d28
+	test_mkdir $DIR/d28
 	$CREATETEST $DIR/d28/ct || error
 }
 run_test 28 "create/mknod/mkdir with bad file types ============"
 
 test_29() {
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	cancel_lru_locks mdc
-	mkdir $DIR/d29
+	test_mkdir $DIR/d29
 	touch $DIR/d29/foo
 	log 'first d29'
 	ls -l $DIR/d29
@@ -1575,6 +1842,7 @@ test_30b() {
 run_test 30b "execute binary from Lustre as non-root ==========="
 
 test_30c() { # b=22376
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	cp `which ls` $DIR || cp /bin/ls $DIR
 	chmod a-rw $DIR/ls
 	cancel_lru_locks mdc
@@ -1622,8 +1890,9 @@ test_31e() { # bug 2904
 run_test 31e "remove of open non-empty directory ==============="
 
 test_31f() { # bug 4554
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	set -vx
-	mkdir $DIR/d31f
+	test_mkdir $DIR/d31f
 	$SETSTRIPE -S 1048576 -c 1 $DIR/d31f
 	cp /etc/hosts $DIR/d31f
 	ls -l $DIR/d31f
@@ -1632,7 +1901,7 @@ test_31f() { # bug 4554
 	MULTIPID=$!
 
 	rm -rv $DIR/d31f || error "first of $DIR/d31f"
-	mkdir $DIR/d31f
+	test_mkdir $DIR/d31f
 	$SETSTRIPE -S 1048576 -c 1 $DIR/d31f
 	cp /etc/hosts $DIR/d31f
 	ls -l $DIR/d31f
@@ -1653,7 +1922,8 @@ run_test 31f "remove of open directory with open-unlink file ==="
 
 test_31g() {
         echo "-- cross directory link --"
-        mkdir $DIR/d31g{a,b}
+        test_mkdir $DIR/d31ga
+        test_mkdir $DIR/d31gb
         touch $DIR/d31ga/f
         ln $DIR/d31ga/f $DIR/d31gb/g
         $CHECKSTAT -t file $DIR/d31ga/f || error "source"
@@ -1665,8 +1935,8 @@ run_test 31g "cross directory link==============="
 
 test_31h() {
         echo "-- cross directory link --"
-        mkdir $DIR/d31h
-        mkdir $DIR/d31h/dir
+        test_mkdir $DIR/d31h
+        test_mkdir $DIR/d31h/dir
         touch $DIR/d31h/f
         ln $DIR/d31h/f $DIR/d31h/dir/g
         $CHECKSTAT -t file $DIR/d31h/f || error "source"
@@ -1678,8 +1948,8 @@ run_test 31h "cross directory link under child==============="
 
 test_31i() {
         echo "-- cross directory link --"
-        mkdir $DIR/d31i
-        mkdir $DIR/d31i/dir
+        test_mkdir $DIR/d31i
+        test_mkdir $DIR/d31i/dir
         touch $DIR/d31i/dir/f
         ln $DIR/d31i/dir/f $DIR/d31i/g
         $CHECKSTAT -t file $DIR/d31i/dir/f || error "source"
@@ -1691,8 +1961,8 @@ run_test 31i "cross directory link under parent==============="
 
 
 test_31j() {
-        mkdir $DIR/d31j
-        mkdir $DIR/d31j/dir1
+        test_mkdir $DIR/d31j
+        test_mkdir $DIR/d31j/dir1
         ln $DIR/d31j/dir1 $DIR/d31j/dir2 && error "ln for dir"
         link $DIR/d31j/dir1 $DIR/d31j/dir3 && error "link for dir"
         mlink $DIR/d31j/dir1 $DIR/d31j/dir4 && error "mlink for dir"
@@ -1703,7 +1973,7 @@ run_test 31j "link for directory==============="
 
 
 test_31k() {
-        mkdir $DIR/d31k
+        test_mkdir $DIR/d31k
         touch $DIR/d31k/s
         touch $DIR/d31k/exist
         mlink $DIR/d31k/s $DIR/d31k/t || error "mlink"
@@ -1718,9 +1988,9 @@ test_31k() {
 run_test 31k "link to file: the same, non-existing, dir==============="
 
 test_31m() {
-        mkdir $DIR/d31m
+        test_mkdir $DIR/d31m
         touch $DIR/d31m/s
-        mkdir $DIR/d31m2
+        test_mkdir $DIR/d31m2
         touch $DIR/d31m2/exist
         mlink $DIR/d31m/s $DIR/d31m2/t || error "mlink"
         mlink $DIR/d31m/s $DIR/d31m2/exist && error "mlink to exist file"
@@ -1732,48 +2002,61 @@ test_31m() {
 }
 run_test 31m "link to file: the same, non-existing, dir==============="
 
+cleanup_test32_mount() {
+	trap 0
+	$UMOUNT $DIR/$tdir/ext2-mountpoint
+}
+
 test_32a() {
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	echo "== more mountpoints and symlinks ================="
-	[ -e $DIR/d32a ] && rm -fr $DIR/d32a
-	mkdir -p $DIR/d32a/ext2-mountpoint
-	mount -t ext2 -o loop $EXT2_DEV $DIR/d32a/ext2-mountpoint || error
-	$CHECKSTAT -t dir $DIR/d32a/ext2-mountpoint/.. || error
-	$UMOUNT $DIR/d32a/ext2-mountpoint || error
+	[ -e $DIR/$tdir ] && rm -fr $DIR/$tdir
+	trap cleanup_test32_mount EXIT
+	test_mkdir -p $DIR/$tdir/ext2-mountpoint
+	mount -t ext2 -o loop $EXT2_DEV $DIR/$tdir/ext2-mountpoint || error
+	$CHECKSTAT -t dir $DIR/$tdir/ext2-mountpoint/.. || error
+	cleanup_test32_mount
 }
 run_test 32a "stat d32a/ext2-mountpoint/.. ====================="
 
 test_32b() {
-	[ -e $DIR/d32b ] && rm -fr $DIR/d32b
-	mkdir -p $DIR/d32b/ext2-mountpoint
-	mount -t ext2 -o loop $EXT2_DEV $DIR/d32b/ext2-mountpoint || error
-	ls -al $DIR/d32b/ext2-mountpoint/.. || error
-	$UMOUNT $DIR/d32b/ext2-mountpoint || error
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
+	[ -e $DIR/$tdir ] && rm -fr $DIR/$tdir
+	trap cleanup_test32_mount EXIT
+	test_mkdir -p $DIR/$tdir/ext2-mountpoint
+	mount -t ext2 -o loop $EXT2_DEV $DIR/$tdir/ext2-mountpoint || error
+	ls -al $DIR/$tdir/ext2-mountpoint/.. || error
+	cleanup_test32_mount
 }
 run_test 32b "open d32b/ext2-mountpoint/.. ====================="
 
 test_32c() {
-	[ -e $DIR/d32c ] && rm -fr $DIR/d32c
-	mkdir -p $DIR/d32c/ext2-mountpoint
-	mount -t ext2 -o loop $EXT2_DEV $DIR/d32c/ext2-mountpoint || error
-	mkdir -p $DIR/d32c/d2/test_dir
-	$CHECKSTAT -t dir $DIR/d32c/ext2-mountpoint/../d2/test_dir || error
-	$UMOUNT $DIR/d32c/ext2-mountpoint || error
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
+	[ -e $DIR/$tdir ] && rm -fr $DIR/$tdir
+	trap cleanup_test32_mount EXIT
+	test_mkdir -p $DIR/$tdir/ext2-mountpoint
+	mount -t ext2 -o loop $EXT2_DEV $DIR/$tdir/ext2-mountpoint || error
+	test_mkdir -p $DIR/$tdir/d2/test_dir
+	$CHECKSTAT -t dir $DIR/$tdir/ext2-mountpoint/../d2/test_dir || error
+	cleanup_test32_mount
 }
 run_test 32c "stat d32c/ext2-mountpoint/../d2/test_dir ========="
 
 test_32d() {
-	[ -e $DIR/d32d ] && rm -fr $DIR/d32d
-	mkdir -p $DIR/d32d/ext2-mountpoint
-	mount -t ext2 -o loop $EXT2_DEV $DIR/d32d/ext2-mountpoint || error
-	mkdir -p $DIR/d32d/d2/test_dir
-	ls -al $DIR/d32d/ext2-mountpoint/../d2/test_dir || error
-	$UMOUNT $DIR/d32d/ext2-mountpoint || error
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
+	[ -e $DIR/$tdir ] && rm -fr $DIR/$tdir
+	trap cleanup_test32_mount EXIT
+	test_mkdir -p $DIR/$tdir/ext2-mountpoint
+	mount -t ext2 -o loop $EXT2_DEV $DIR/$tdir/ext2-mountpoint || error
+	test_mkdir -p $DIR/$tdir/d2/test_dir
+	ls -al $DIR/$tdir/ext2-mountpoint/../d2/test_dir || error
+	cleanup_test32_mount
 }
 run_test 32d "open d32d/ext2-mountpoint/../d2/test_dir ========="
 
 test_32e() {
 	[ -e $DIR/d32e ] && rm -fr $DIR/d32e
-	mkdir -p $DIR/d32e/tmp
+	test_mkdir -p $DIR/d32e/tmp
 	TMP_DIR=$DIR/d32e/tmp
 	ln -s $DIR/d32e $TMP_DIR/symlink11
 	ln -s $TMP_DIR/symlink11 $TMP_DIR/../symlink01
@@ -1784,7 +2067,7 @@ run_test 32e "stat d32e/symlink->tmp/symlink->lustre-subdir ===="
 
 test_32f() {
 	[ -e $DIR/d32f ] && rm -fr $DIR/d32f
-	mkdir -p $DIR/d32f/tmp
+	test_mkdir -p $DIR/d32f/tmp
 	TMP_DIR=$DIR/d32f/tmp
 	ln -s $DIR/d32f $TMP_DIR/symlink11
 	ln -s $TMP_DIR/symlink11 $TMP_DIR/../symlink01
@@ -1795,7 +2078,8 @@ run_test 32f "open d32f/symlink->tmp/symlink->lustre-subdir ===="
 
 test_32g() {
 	TMP_DIR=$DIR/$tdir/tmp
-	mkdir -p $TMP_DIR $DIR/${tdir}2
+	test_mkdir -p $DIR/$tdir/tmp
+	test_mkdir $DIR/${tdir}2
 	ln -s $DIR/${tdir}2 $TMP_DIR/symlink12
 	ln -s $TMP_DIR/symlink12 $TMP_DIR/../symlink02
 	$CHECKSTAT -t link $TMP_DIR/symlink12 || error
@@ -1808,7 +2092,8 @@ run_test 32g "stat d32g/symlink->tmp/symlink->lustre-subdir/${tdir}2"
 test_32h() {
 	rm -fr $DIR/$tdir $DIR/${tdir}2
 	TMP_DIR=$DIR/$tdir/tmp
-	mkdir -p $TMP_DIR $DIR/${tdir}2
+	test_mkdir -p $DIR/$tdir/tmp
+	test_mkdir $DIR/${tdir}2
 	ln -s $DIR/${tdir}2 $TMP_DIR/symlink12
 	ln -s $TMP_DIR/symlink12 $TMP_DIR/../symlink02
 	ls $TMP_DIR/symlink12 || error
@@ -1817,50 +2102,58 @@ test_32h() {
 run_test 32h "open d32h/symlink->tmp/symlink->lustre-subdir/${tdir}2"
 
 test_32i() {
-	[ -e $DIR/d32i ] && rm -fr $DIR/d32i
-	mkdir -p $DIR/d32i/ext2-mountpoint
-	mount -t ext2 -o loop $EXT2_DEV $DIR/d32i/ext2-mountpoint || error
-	touch $DIR/d32i/test_file
-	$CHECKSTAT -t file $DIR/d32i/ext2-mountpoint/../test_file || error
-	$UMOUNT $DIR/d32i/ext2-mountpoint || error
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
+	[ -e $DIR/$tdir ] && rm -fr $DIR/$tdir
+	trap cleanup_test32_mount EXIT
+	test_mkdir -p $DIR/$tdir/ext2-mountpoint
+	mount -t ext2 -o loop $EXT2_DEV $DIR/$tdir/ext2-mountpoint || error
+	touch $DIR/$tdir/test_file
+	$CHECKSTAT -t file $DIR/$tdir/ext2-mountpoint/../test_file || error
+	cleanup_test32_mount
 }
 run_test 32i "stat d32i/ext2-mountpoint/../test_file ==========="
 
 test_32j() {
-	[ -e $DIR/d32j ] && rm -fr $DIR/d32j
-	mkdir -p $DIR/d32j/ext2-mountpoint
-	mount -t ext2 -o loop $EXT2_DEV $DIR/d32j/ext2-mountpoint || error
-	touch $DIR/d32j/test_file
-	cat $DIR/d32j/ext2-mountpoint/../test_file || error
-	$UMOUNT $DIR/d32j/ext2-mountpoint || error
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
+	[ -e $DIR/$tdir ] && rm -fr $DIR/$tdir
+	trap cleanup_test32_mount EXIT
+	test_mkdir -p $DIR/$tdir/ext2-mountpoint
+	mount -t ext2 -o loop $EXT2_DEV $DIR/$tdir/ext2-mountpoint || error
+	touch $DIR/$tdir/test_file
+	cat $DIR/$tdir/ext2-mountpoint/../test_file || error
+	cleanup_test32_mount
 }
 run_test 32j "open d32j/ext2-mountpoint/../test_file ==========="
 
 test_32k() {
-	rm -fr $DIR/d32k
-	mkdir -p $DIR/d32k/ext2-mountpoint
-	mount -t ext2 -o loop $EXT2_DEV $DIR/d32k/ext2-mountpoint
-	mkdir -p $DIR/d32k/d2
-	touch $DIR/d32k/d2/test_file || error
-	$CHECKSTAT -t file $DIR/d32k/ext2-mountpoint/../d2/test_file || error
-	$UMOUNT $DIR/d32k/ext2-mountpoint || error
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
+	rm -fr $DIR/$tdir
+	trap cleanup_test32_mount EXIT
+	test_mkdir -p $DIR/$tdir/ext2-mountpoint
+	mount -t ext2 -o loop $EXT2_DEV $DIR/$tdir/ext2-mountpoint
+	test_mkdir -p $DIR/$tdir/d2
+	touch $DIR/$tdir/d2/test_file || error
+	$CHECKSTAT -t file $DIR/$tdir/ext2-mountpoint/../d2/test_file || error
+	cleanup_test32_mount
 }
 run_test 32k "stat d32k/ext2-mountpoint/../d2/test_file ========"
 
 test_32l() {
-	rm -fr $DIR/d32l
-	mkdir -p $DIR/d32l/ext2-mountpoint
-	mount -t ext2 -o loop $EXT2_DEV $DIR/d32l/ext2-mountpoint || error
-	mkdir -p $DIR/d32l/d2
-	touch $DIR/d32l/d2/test_file
-	cat  $DIR/d32l/ext2-mountpoint/../d2/test_file || error
-	$UMOUNT $DIR/d32l/ext2-mountpoint || error
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
+	rm -fr $DIR/$tdir
+	trap cleanup_test32_mount EXIT
+	test_mkdir -p $DIR/$tdir/ext2-mountpoint
+	mount -t ext2 -o loop $EXT2_DEV $DIR/$tdir/ext2-mountpoint || error
+	test_mkdir -p $DIR/$tdir/d2
+	touch $DIR/$tdir/d2/test_file
+	cat  $DIR/$tdir/ext2-mountpoint/../d2/test_file || error
+	cleanup_test32_mount
 }
 run_test 32l "open d32l/ext2-mountpoint/../d2/test_file ========"
 
 test_32m() {
 	rm -fr $DIR/d32m
-	mkdir -p $DIR/d32m/tmp
+	test_mkdir -p $DIR/d32m/tmp
 	TMP_DIR=$DIR/d32m/tmp
 	ln -s $DIR $TMP_DIR/symlink11
 	ln -s $TMP_DIR/symlink11 $TMP_DIR/../symlink01
@@ -1871,7 +2164,7 @@ run_test 32m "stat d32m/symlink->tmp/symlink->lustre-root ======"
 
 test_32n() {
 	rm -fr $DIR/d32n
-	mkdir -p $DIR/d32n/tmp
+	test_mkdir -p $DIR/d32n/tmp
 	TMP_DIR=$DIR/d32n/tmp
 	ln -s $DIR $TMP_DIR/symlink11
 	ln -s $TMP_DIR/symlink11 $TMP_DIR/../symlink01
@@ -1883,7 +2176,7 @@ run_test 32n "open d32n/symlink->tmp/symlink->lustre-root ======"
 test_32o() {
 	rm -fr $DIR/d32o $DIR/$tfile
 	touch $DIR/$tfile
-	mkdir -p $DIR/d32o/tmp
+	test_mkdir -p $DIR/d32o/tmp
 	TMP_DIR=$DIR/d32o/tmp
 	ln -s $DIR/$tfile $TMP_DIR/symlink12
 	ln -s $TMP_DIR/symlink12 $TMP_DIR/../symlink02
@@ -1902,7 +2195,7 @@ test_32p() {
     log 32p_3
 	touch $DIR/$tfile
     log 32p_4
-	mkdir -p $DIR/d32p/tmp
+	test_mkdir -p $DIR/d32p/tmp
     log 32p_5
 	TMP_DIR=$DIR/d32p/tmp
     log 32p_6
@@ -1917,27 +2210,36 @@ test_32p() {
 }
 run_test 32p "open d32p/symlink->tmp/symlink->lustre-root/$tfile"
 
+cleanup_testdir_mount() {
+	trap 0
+	$UMOUNT $DIR/$tdir
+}
+
 test_32q() {
-	[ -e $DIR/d32q ] && rm -fr $DIR/d32q
-	mkdir -p $DIR/d32q
-        touch $DIR/d32q/under_the_mount
-	mount -t ext2 -o loop $EXT2_DEV $DIR/d32q
-	ls $DIR/d32q/under_the_mount && error || true
-	$UMOUNT $DIR/d32q || error
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
+	[ -e $DIR/$tdir ] && rm -fr $DIR/$tdir
+	trap cleanup_testdir_mount EXIT
+	test_mkdir -p $DIR/$tdir
+        touch $DIR/$tdir/under_the_mount
+	mount -t ext2 -o loop $EXT2_DEV $DIR/$tdir
+	ls $DIR/$tdir | grep "\<under_the_mount\>" && error
+	cleanup_testdir_mount
 }
 run_test 32q "stat follows mountpoints in Lustre (should return error)"
 
 test_32r() {
-	[ -e $DIR/d32r ] && rm -fr $DIR/d32r
-	mkdir -p $DIR/d32r
-        touch $DIR/d32r/under_the_mount
-	mount -t ext2 -o loop $EXT2_DEV $DIR/d32r
-	ls $DIR/d32r | grep -q under_the_mount && error || true
-	$UMOUNT $DIR/d32r || error
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
+	[ -e $DIR/$tdir ] && rm -fr $DIR/$tdir
+	trap cleanup_testdir_mount EXIT
+	test_mkdir -p $DIR/$tdir
+        touch $DIR/$tdir/under_the_mount
+	mount -t ext2 -o loop $EXT2_DEV $DIR/$tdir
+	ls $DIR/$tdir | grep -q under_the_mount && error || true
+	cleanup_testdir_mount
 }
 run_test 32r "opendir follows mountpoints in Lustre (should return error)"
 
-test_33() {
+test_33aa() {
 	rm -f $DIR/$tfile
 	touch $DIR/$tfile
 	chmod 444 $DIR/$tfile
@@ -1946,11 +2248,11 @@ test_33() {
 	$RUNAS $OPENFILE -f O_RDWR $DIR/$tfile && error || true
 	log 33_2
 }
-run_test 33 "write file with mode 444 (should return error) ===="
+run_test 33aa "write file with mode 444 (should return error) ===="
 
 test_33a() {
         rm -fr $DIR/d33
-        mkdir -p $DIR/d33
+        test_mkdir -p $DIR/d33
         chown $RUNAS_ID $DIR/d33
         $RUNAS $OPENFILE -f O_RDWR:O_CREAT -m 0444 $DIR/d33/f33|| error "create"
         $RUNAS $OPENFILE -f O_RDWR:O_CREAT -m 0444 $DIR/d33/f33 && \
@@ -1960,13 +2262,14 @@ run_test 33a "test open file(mode=0444) with O_RDWR (should return error)"
 
 test_33b() {
         rm -fr $DIR/d33
-        mkdir -p $DIR/d33
+        test_mkdir -p $DIR/d33
         chown $RUNAS_ID $DIR/d33
         $RUNAS $OPENFILE -f 1286739555 $DIR/d33/f33 && error "create" || true
 }
 run_test 33b "test open file with malformed flags (No panic and return error)"
 
 test_33c() {
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
         local ostnum
         local ostname
         local write_bytes
@@ -1975,7 +2278,7 @@ test_33c() {
         remote_ost_nodsh && skip "remote OST with nodsh" && return
         all_zeros=:
         rm -fr $DIR/d33
-        mkdir -p $DIR/d33
+        test_mkdir -p $DIR/d33
         # Read: 0, Write: 4, create/destroy: 2/0, stat: 1, punch: 0
 
         sync
@@ -2031,6 +2334,32 @@ test_33c() {
 }
 run_test 33c "test llobdstat and write_bytes"
 
+test_33d() {
+	[ $MDSCOUNT -lt 2 ] && skip "needs >= 2 MDTs" && return
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
+	local MDTIDX=1
+	local remote_dir=$DIR/$tdir/remote_dir
+
+	mkdir -p $DIR/$tdir
+	$LFS mkdir -i $MDTIDX $remote_dir ||
+		error "create remote directory failed"
+
+	touch $remote_dir/$tfile
+	chmod 444 $remote_dir/$tfile
+	chown $RUNAS_ID $remote_dir/$tfile
+
+	$RUNAS $OPENFILE -f O_RDWR $DIR/$tfile && error || true
+
+	chown $RUNAS_ID $remote_dir
+	$RUNAS $OPENFILE -f O_RDWR:O_CREAT -m 0444 $remote_dir/f33 ||
+					error "create" || true
+	$RUNAS $OPENFILE -f O_RDWR:O_CREAT -m 0444 $remote_dir/f33 &&
+				    error "open RDWR" || true
+	$RUNAS $OPENFILE -f 1286739555 $remote_dir/f33 &&
+				    error "create" || true
+}
+run_test 33d "openfile with 444 modes and malformed flags under remote dir"
+
 TEST_34_SIZE=${TEST_34_SIZE:-2000000000000}
 test_34a() {
 	rm -f $DIR/f34
@@ -2079,6 +2408,7 @@ test_34e() {
 run_test 34e "create objects, some with size and some without =="
 
 test_34f() { # bug 6242, 6243
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	SIZE34F=48000
 	rm -f $DIR/f34f
 	$MCREATE $DIR/f34f || error
@@ -2093,6 +2423,7 @@ test_34f() { # bug 6242, 6243
 run_test 34f "read from a file with no objects until EOF ======="
 
 test_34g() {
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	dd if=/dev/zero of=$DIR/$tfile bs=1 count=100 seek=$TEST_34_SIZE || error
 	$TRUNCATE $DIR/$tfile $((TEST_34_SIZE / 2))|| error
 	$CHECKSTAT -s $((TEST_34_SIZE / 2)) $DIR/$tfile || error "truncate failed"
@@ -2110,6 +2441,7 @@ test_34g() {
 run_test 34g "truncate long file ==============================="
 
 test_34h() {
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	local gid=10
 	local sz=1000
 
@@ -2151,7 +2483,7 @@ run_test 36b "OST utime check (open, utime) ===================="
 
 test_36c() {
 	rm -f $DIR/d36/f36
-	mkdir $DIR/d36
+	test_mkdir $DIR/d36
 	chown $RUNAS_ID $DIR/d36
 	$RUNAS utime $DIR/d36/f36 || error
 }
@@ -2166,7 +2498,7 @@ run_test 36d "non-root OST utime check (open, utime) ==========="
 
 test_36e() {
 	[ $RUNAS_ID -eq $UID ] && skip_env "RUNAS_ID = UID = $UID -- skipping" && return
-	mkdir -p $DIR/$tdir
+	test_mkdir -p $DIR/$tdir
 	touch $DIR/$tdir/$tfile
 	$RUNAS utime $DIR/$tdir/$tfile && \
 		error "utime worked, expected failure" || true
@@ -2180,7 +2512,7 @@ subr_36fh() {
 	export LANG=C LC_LANG=C # for date language
 
 	DATESTR="Dec 20  2000"
-	mkdir -p $DIR/$tdir
+	test_mkdir -p $DIR/$tdir
 	lctl set_param fail_loc=$fl
 	date; date +%s
 	cp /etc/hosts $DIR/$tdir/$tfile
@@ -2201,6 +2533,7 @@ subr_36fh() {
 }
 
 test_36f() {
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	#define OBD_FAIL_OST_BRW_PAUSE_BULK 0x214
 	subr_36fh "0x80000214"
 }
@@ -2208,11 +2541,12 @@ run_test 36f "utime on file racing with OST BRW write =========="
 
 test_36g() {
 	remote_ost_nodsh && skip "remote OST with nodsh" && return
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	local fmd_max_age
 	local fmd_before
 	local fmd_after
 
-	mkdir -p $DIR/$tdir
+	test_mkdir -p $DIR/$tdir
 	fmd_max_age=$(do_facet ost1 \
 		"lctl get_param -n obdfilter.*.client_cache_seconds 2> /dev/null | \
 		head -n 1")
@@ -2233,20 +2567,13 @@ test_36g() {
 run_test 36g "filter mod data cache expiry ====================="
 
 test_36h() {
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	#define OBD_FAIL_OST_BRW_PAUSE_BULK2 0x227
 	subr_36fh "0x80000227"
 }
 run_test 36h "utime on file racing with OST BRW write =========="
 
-test_37() {
-	mkdir -p $DIR/$tdir
-	echo f > $DIR/$tdir/fbugfile
-	mount -t ext2 -o loop $EXT2_DEV $DIR/$tdir
-	ls $DIR/$tdir | grep "\<fbugfile\>" && error
-	$UMOUNT $DIR/$tdir || error
-	rm -f $DIR/$tdir/fbugfile || error
-}
-run_test 37 "ls a mounted file system to check old content ====="
+# test_37 - duplicate with tests 32q 32r
 
 test_38() {
 	local file=$DIR/$tfile
@@ -2280,7 +2607,7 @@ test_39() {
 run_test 39 "mtime changed on create ==========================="
 
 test_39b() {
-	mkdir -p $DIR/$tdir
+	test_mkdir -p $DIR/$tdir
 	cp -p /etc/passwd $DIR/$tdir/fopen
 	cp -p /etc/passwd $DIR/$tdir/flink
 	cp -p /etc/passwd $DIR/$tdir/funlink
@@ -2356,6 +2683,7 @@ run_test 39c "mtime change on rename ==========================="
 
 # bug 21114
 test_39d() {
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	touch $DIR1/$tfile
 
 	touch -m -d @$TEST_39_MTIME $DIR1/$tfile
@@ -2373,6 +2701,7 @@ run_test 39d "create, utime, stat =============================="
 
 # bug 21114
 test_39e() {
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	touch $DIR1/$tfile
 	local mtime1=`stat -c %Y $DIR1/$tfile`
 
@@ -2391,6 +2720,7 @@ run_test 39e "create, stat, utime, stat ========================"
 
 # bug 21114
 test_39f() {
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	touch $DIR1/$tfile
 	mtime1=`stat -c %Y $DIR1/$tfile`
 
@@ -2410,6 +2740,7 @@ run_test 39f "create, stat, sleep, utime, stat ================="
 
 # bug 11063
 test_39g() {
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	echo hello >> $DIR1/$tfile
 	local mtime1=`stat -c %Y $DIR1/$tfile`
 
@@ -2429,6 +2760,7 @@ run_test 39g "write, chmod, stat ==============================="
 
 # bug 11063
 test_39h() {
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	touch $DIR1/$tfile
 	sleep 1
 
@@ -2454,6 +2786,7 @@ test_39h() {
 run_test 39h "write, utime within one second, stat ============="
 
 test_39i() {
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	touch $DIR1/$tfile
 	sleep 1
 
@@ -2475,6 +2808,7 @@ test_39i() {
 run_test 39i "write, rename, stat =============================="
 
 test_39j() {
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	start_full_debug_logging
 	touch $DIR1/$tfile
 	sleep 1
@@ -2506,6 +2840,7 @@ test_39j() {
 run_test 39j "write, rename, close, stat ======================="
 
 test_39k() {
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	touch $DIR1/$tfile
 	sleep 1
 
@@ -2534,16 +2869,18 @@ run_test 39k "write, utime, close, stat ========================"
 TEST_39_ATIME=`date -d "1 year" +%s`
 
 test_39l() {
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	remote_mds_nodsh && skip "remote MDS with nodsh" && return
-	local atime_diff=$(do_facet $SINGLEMDS lctl get_param -n mdd.*.atime_diff)
-
+	local atime_diff=$(do_facet $SINGLEMDS \
+				lctl get_param -n mdd.*MDT0000*.atime_diff)
+	rm -rf $DIR/$tdir
 	mkdir -p $DIR/$tdir
 
 	# test setting directory atime to future
 	touch -a -d @$TEST_39_ATIME $DIR/$tdir
 	local atime=$(stat -c %X $DIR/$tdir)
 	[ "$atime" = $TEST_39_ATIME ] || \
-		error "atime is not set to future: $atime, should be $TEST_39_ATIME"
+		error "atime is not set to future: $atime, $TEST_39_ATIME"
 
 	# test setting directory atime from future to now
 	local d1=$(date +%s)
@@ -2553,9 +2890,9 @@ test_39l() {
 	cancel_lru_locks mdc
 	atime=$(stat -c %X $DIR/$tdir)
 	[ "$atime" -ge "$d1" -a "$atime" -le "$d2" ] || \
-		error "atime is not updated from future: $atime, should be $d1<atime<$d2"
+		error "atime is not updated from future: $atime, $d1<atime<$d2"
 
-	do_facet $SINGLEMDS lctl set_param -n mdd.*.atime_diff=2
+	do_facet $SINGLEMDS lctl set_param -n mdd.*MDT0000*.atime_diff=2
 	sleep 3
 
 	# test setting directory atime when now > dir atime + atime_diff
@@ -2567,7 +2904,7 @@ test_39l() {
 	[ "$atime" -ge "$d1" -a "$atime" -le "$d2" ] || \
 		error "atime is not updated  : $atime, should be $d2"
 
-	do_facet $SINGLEMDS lctl set_param -n mdd.*.atime_diff=60
+	do_facet $SINGLEMDS lctl set_param -n mdd.*MDT0000*.atime_diff=60
 	sleep 3
 
 	# test not setting directory atime when now < dir atime + atime_diff
@@ -2577,11 +2914,13 @@ test_39l() {
 	[ "$atime" -ge "$d1" -a "$atime" -le "$d2" ] || \
 		error "atime is updated to $atime, should remain $d1<atime<$d2"
 
-	do_facet $SINGLEMDS lctl set_param -n mdd.*.atime_diff=$atime_diff
+	do_facet $SINGLEMDS \
+		lctl set_param -n mdd.*MDT0000*.atime_diff=$atime_diff
 }
 run_test 39l "directory atime update ==========================="
 
 test_39m() {
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	touch $DIR1/$tfile
 	sleep 2
 	local far_past_mtime=$(date -d "May 29 1953" +%s)
@@ -2672,6 +3011,7 @@ setup_test42() {
 # Tests 42* verify that our behaviour is correct WRT caching, file closure,
 # file truncation, and file removal.
 test_42a() {
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	setup_test42
 	cancel_lru_locks osc
 	stop_writeback
@@ -2687,6 +3027,7 @@ test_42a() {
 run_test 42a "ensure that we don't flush on close =============="
 
 test_42b() {
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	setup_test42
 	cancel_lru_locks osc
 	stop_writeback
@@ -2743,6 +3084,7 @@ trunc_test() {
 }
 
 test_42c() {
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
         trunc_test 42c 1024
         [ $BEFOREWRITES -eq $AFTERWRITES ] && \
             error "beforewrites $BEFOREWRITES == afterwrites $AFTERWRITES on truncate"
@@ -2751,6 +3093,7 @@ test_42c() {
 run_test 42c "test partial truncate of file with cached dirty data"
 
 test_42d() {
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
         trunc_test 42d 0
         [ $BEFOREWRITES -eq $AFTERWRITES ] || \
             error "beforewrites $BEFOREWRITES != afterwrites $AFTERWRITES on truncate"
@@ -2759,6 +3102,7 @@ test_42d() {
 run_test 42d "test complete truncate of file with cached dirty data"
 
 test_42e() { # bug22074
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	local TDIR=$DIR/${tdir}e
 	local pagesz=$(page_size)
 	local pages=16 # hardcoded 16 pages, don't change it.
@@ -2767,7 +3111,7 @@ test_42e() { # bug22074
 	local max_dirty_mb
 	local warmup_files
 
-	mkdir -p $TDIR
+	test_mkdir -p $DIR/${tdir}e
 	$SETSTRIPE -c 1 $TDIR
 	createmany -o $TDIR/f $files
 
@@ -2834,7 +3178,7 @@ test_42e() { # bug22074
 run_test 42e "verify sub-RPC writes are not done synchronously"
 
 test_43() {
-	mkdir -p $DIR/$tdir
+	test_mkdir -p $DIR/$tdir
 	cp -p /bin/ls $DIR/$tdir/$tfile
 	$MULTIOP $DIR/$tdir/$tfile Ow_c &
 	pid=$!
@@ -2847,11 +3191,14 @@ test_43() {
 run_test 43 "execution of file opened for write should return -ETXTBSY"
 
 test_43a() {
-        mkdir -p $DIR/d43
-	cp -p `which $MULTIOP` $DIR/d43/multiop || cp -p multiop $DIR/d43/multiop
-        MULTIOP_PROG=$DIR/d43/multiop multiop_bg_pause $TMP/test43.junk O_c || return 1
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
+	test_mkdir -p $DIR/$tdir
+	cp -p `which $MULTIOP` $DIR/$tdir/multiop ||
+			cp -p multiop $DIR/$tdir/multiop
+        MULTIOP_PROG=$DIR/$tdir/multiop multiop_bg_pause $TMP/test43.junk O_c ||
+			return 1
         MULTIOP_PID=$!
-        $MULTIOP $DIR/d43/multiop Oc && error "expected error, got success"
+        $MULTIOP $DIR/$tdir/multiop Oc && error "expected error, got success"
         kill -USR1 $MULTIOP_PID || return 2
         wait $MULTIOP_PID || return 3
         rm $TMP/test43.junk
@@ -2859,11 +3206,14 @@ test_43a() {
 run_test 43a "open(RDWR) of file being executed should return -ETXTBSY"
 
 test_43b() {
-        mkdir -p $DIR/d43
-	cp -p `which $MULTIOP` $DIR/d43/multiop || cp -p multiop $DIR/d43/multiop
-        MULTIOP_PROG=$DIR/d43/multiop multiop_bg_pause $TMP/test43.junk O_c || return 1
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
+	test_mkdir -p $DIR/$tdir
+	cp -p `which $MULTIOP` $DIR/$tdir/multiop ||
+			cp -p multiop $DIR/$tdir/multiop
+        MULTIOP_PROG=$DIR/$tdir/multiop multiop_bg_pause $TMP/test43.junk O_c ||
+			return 1
         MULTIOP_PID=$!
-        $TRUNCATE $DIR/d43/multiop 0 && error "expected error, got success"
+        $TRUNCATE $DIR/$tdir/multiop 0 && error "expected error, got success"
         kill -USR1 $MULTIOP_PID || return 2
         wait $MULTIOP_PID || return 3
         rm $TMP/test43.junk
@@ -2871,8 +3221,8 @@ test_43b() {
 run_test 43b "truncate of file being executed should return -ETXTBSY"
 
 test_43c() {
-	local testdir="$DIR/d43c"
-	mkdir -p $testdir
+	local testdir="$DIR/$tdir"
+	test_mkdir -p $DIR/$tdir
 	cp $SHELL $testdir/
 	( cd $(dirname $SHELL) && md5sum $(basename $SHELL) ) | \
 		( cd $testdir && md5sum -c)
@@ -2937,6 +3287,7 @@ do_dirty_record() {
 	echo before $before, after $after
 }
 test_45() {
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	f="$DIR/f45"
 	# Obtain grants from OST if it supports it
 	echo blah > ${f}_grant
@@ -2963,6 +3314,7 @@ run_test 45 "osc io page accounting ============================"
 # objects offset and an assert hit when an rpc was built with 1023's mapped
 # offset 511 and 511's raw 511 offset. it also found general redirtying bugs.
 test_46() {
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	f="$DIR/f46"
 	stop_writeback
 	sync
@@ -2979,20 +3331,22 @@ run_test 46 "dirtying a previously written page ================"
 
 test_48a() { # bug 2399
 	check_kernel_version 34 || return 0
-	mkdir -p $DIR/d48a
-	cd $DIR/d48a
-	mv $DIR/d48a $DIR/d48.new || error "move directory failed"
-	mkdir $DIR/d48a || error "recreate directory failed"
+	test_mkdir -p $DIR/$tdir
+	cd $DIR/$tdir
+	mv $DIR/$tdir $DIR/d48.new || error "move directory failed"
+	test_mkdir $DIR/$tdir || error "recreate directory failed"
 	touch foo || error "'touch foo' failed after recreating cwd"
-	mkdir bar || error "'mkdir foo' failed after recreating cwd"
+	test_mkdir $DIR/$tdir/bar ||
+		     error "'mkdir foo' failed after recreating cwd"
 	if check_kernel_version 44; then
 		touch .foo || error "'touch .foo' failed after recreating cwd"
-		mkdir .bar || error "'mkdir .foo' failed after recreating cwd"
+		test_mkdir $DIR/$tdir/.bar ||
+			      error "'mkdir .foo' failed after recreating cwd"
 	fi
 	ls . > /dev/null || error "'ls .' failed after recreating cwd"
 	ls .. > /dev/null || error "'ls ..' failed after removing cwd"
 	cd . || error "'cd .' failed after recreating cwd"
-	mkdir . && error "'mkdir .' worked after recreating cwd"
+	test_mkdir . && error "'mkdir .' worked after recreating cwd"
 	rmdir . && error "'rmdir .' worked after recreating cwd"
 	ln -s . baz || error "'ln -s .' failed after recreating cwd"
 	cd .. || error "'cd ..' failed after recreating cwd"
@@ -3001,19 +3355,22 @@ run_test 48a "Access renamed working dir (should return errors)="
 
 test_48b() { # bug 2399
 	check_kernel_version 34 || return 0
-	mkdir -p $DIR/d48b
-	cd $DIR/d48b
-	rmdir $DIR/d48b || error "remove cwd $DIR/d48b failed"
+	rm -rf $DIR/$tdir
+	test_mkdir -p $DIR/$tdir
+	cd $DIR/$tdir
+	rmdir $DIR/$tdir || error "remove cwd $DIR/$tdir failed"
 	touch foo && error "'touch foo' worked after removing cwd"
-	mkdir foo && error "'mkdir foo' worked after removing cwd"
+	test_mkdir $DIR/$tdir/foo &&
+		     error "'mkdir foo' worked after removing cwd"
 	if check_kernel_version 44; then
 		touch .foo && error "'touch .foo' worked after removing cwd"
-		mkdir .foo && error "'mkdir .foo' worked after removing cwd"
+		test_mkdir $DIR/$tdir/.foo &&
+			      error "'mkdir .foo' worked after removing cwd"
 	fi
 	ls . > /dev/null && error "'ls .' worked after removing cwd"
 	ls .. > /dev/null || error "'ls ..' failed after removing cwd"
 	is_patchless || ( cd . && error "'cd .' worked after removing cwd" )
-	mkdir . && error "'mkdir .' worked after removing cwd"
+	test_mkdir $DIR/$tdir/. && error "'mkdir .' worked after removing cwd"
 	rmdir . && error "'rmdir .' worked after removing cwd"
 	ln -s . foo && error "'ln -s .' worked after removing cwd"
 	cd .. || echo "'cd ..' failed after removing cwd `pwd`"  #bug 3517
@@ -3024,19 +3381,21 @@ test_48c() { # bug 2350
 	check_kernel_version 36 || return 0
 	#lctl set_param debug=-1
 	#set -vx
-	mkdir -p $DIR/d48c/dir
-	cd $DIR/d48c/dir
-	$TRACE rmdir $DIR/d48c/dir || error "remove cwd $DIR/d48c/dir failed"
-	$TRACE touch foo && error "'touch foo' worked after removing cwd"
-	$TRACE mkdir foo && error "'mkdir foo' worked after removing cwd"
+	rm -rf $DIR/$tdir
+	test_mkdir -p $DIR/$tdir/dir
+	cd $DIR/$tdir/dir
+	$TRACE rmdir $DIR/$tdir/dir || error "remove cwd $DIR/$tdir/dir failed"
+	$TRACE touch foo && error "touch foo worked after removing cwd"
+	$TRACE test_mkdir foo && error "'mkdir foo' worked after removing cwd"
 	if check_kernel_version 44; then
-		touch .foo && error "'touch .foo' worked after removing cwd"
-		mkdir .foo && error "'mkdir .foo' worked after removing cwd"
+		touch .foo && error "touch .foo worked after removing cwd"
+		test_mkdir .foo && error "mkdir .foo worked after removing cwd"
 	fi
 	$TRACE ls . && error "'ls .' worked after removing cwd"
 	$TRACE ls .. || error "'ls ..' failed after removing cwd"
-	is_patchless || ( $TRACE cd . && error "'cd .' worked after removing cwd" )
-	$TRACE mkdir . && error "'mkdir .' worked after removing cwd"
+	is_patchless || ( $TRACE cd . &&
+			error "'cd .' worked after removing cwd" )
+	$TRACE test_mkdir . && error "'mkdir .' worked after removing cwd"
 	$TRACE rmdir . && error "'rmdir .' worked after removing cwd"
 	$TRACE ln -s . foo && error "'ln -s .' worked after removing cwd"
 	$TRACE cd .. || echo "'cd ..' failed after removing cwd `pwd`" #bug 3415
@@ -3047,23 +3406,27 @@ test_48d() { # bug 2350
 	check_kernel_version 36 || return 0
 	#lctl set_param debug=-1
 	#set -vx
-	mkdir -p $DIR/d48d/dir
-	cd $DIR/d48d/dir
-	$TRACE rmdir $DIR/d48d/dir || error "remove cwd $DIR/d48d/dir failed"
-	$TRACE rmdir $DIR/d48d || error "remove parent $DIR/d48d failed"
+	rm -rf $DIR/$tdir
+	test_mkdir -p $DIR/$tdir/dir
+	cd $DIR/$tdir/dir
+	$TRACE rmdir $DIR/$tdir/dir || error "remove cwd $DIR/$tdir/dir failed"
+	$TRACE rmdir $DIR/$tdir || error "remove parent $DIR/$tdir failed"
 	$TRACE touch foo && error "'touch foo' worked after removing parent"
-	$TRACE mkdir foo && error "'mkdir foo' worked after removing parent"
+	$TRACE test_mkdir foo && error "mkdir foo worked after removing parent"
 	if check_kernel_version 44; then
 		touch .foo && error "'touch .foo' worked after removing parent"
-		mkdir .foo && error "'mkdir .foo' worked after removing parent"
+		test_mkdir .foo &&
+			      error "mkdir .foo worked after removing parent"
 	fi
 	$TRACE ls . && error "'ls .' worked after removing parent"
 	$TRACE ls .. && error "'ls ..' worked after removing parent"
-	is_patchless || ( $TRACE cd . && error "'cd .' worked after recreate parent" )
-	$TRACE mkdir . && error "'mkdir .' worked after removing parent"
+	is_patchless || ( $TRACE cd . &&
+			error "'cd .' worked after recreate parent" )
+	$TRACE test_mkdir . && error "'mkdir .' worked after removing parent"
 	$TRACE rmdir . && error "'rmdir .' worked after removing parent"
 	$TRACE ln -s . foo && error "'ln -s .' worked after removing parent"
-	is_patchless || ( $TRACE cd .. && error "'cd ..' worked after removing parent" || true )
+	is_patchless || ( $TRACE cd .. &&
+			error "'cd ..' worked after removing parent" || true )
 }
 run_test 48d "Access removed parent subdir (should return errors)"
 
@@ -3071,21 +3434,23 @@ test_48e() { # bug 4134
 	check_kernel_version 41 || return 0
 	#lctl set_param debug=-1
 	#set -vx
-	mkdir -p $DIR/d48e/dir
-	cd $DIR/d48e/dir
-	$TRACE rmdir $DIR/d48e/dir || error "remove cwd $DIR/d48e/dir failed"
-	$TRACE rmdir $DIR/d48e || error "remove parent $DIR/d48e failed"
-	$TRACE touch $DIR/d48e || error "'touch $DIR/d48e' failed"
-	$TRACE chmod +x $DIR/d48e || error "'chmod +x $DIR/d48e' failed"
+	rm -rf $DIR/$tdir
+	test_mkdir -p $DIR/$tdir/dir
+	cd $DIR/$tdir/dir
+	$TRACE rmdir $DIR/$tdir/dir || error "remove cwd $DIR/$tdir/dir failed"
+	$TRACE rmdir $DIR/$tdir || error "remove parent $DIR/$tdir failed"
+	$TRACE touch $DIR/$tdir || error "'touch $DIR/$tdir' failed"
+	$TRACE chmod +x $DIR/$tdir || error "'chmod +x $DIR/$tdir' failed"
 	# On a buggy kernel addition of "touch foo" after cd .. will
 	# produce kernel oops in lookup_hash_it
 	touch ../foo && error "'cd ..' worked after recreate parent"
 	cd $DIR
-	$TRACE rm $DIR/d48e || error "rm '$DIR/d48e' failed"
+	$TRACE rm $DIR/$tdir || error "rm '$DIR/$tdir' failed"
 }
 run_test 48e "Access to recreated parent subdir (should return errors)"
 
 test_49() { # LU-1030
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	# get ost1 size - lustre-OST0000
 	ost1_size=$(do_facet ost1 lfs df |grep ${ost1_svc} |awk '{print $4}')
 	# write 800M at maximum
@@ -3111,133 +3476,116 @@ run_test 49 "Change max_pages_per_rpc won't break osc extent"
 
 test_50() {
 	# bug 1485
-	mkdir $DIR/d50
-	cd $DIR/d50
+	test_mkdir $DIR/$tdir
+	cd $DIR/$tdir
 	ls /proc/$$/cwd || error
 }
 run_test 50 "special situations: /proc symlinks  ==============="
 
 test_51a() {	# was test_51
 	# bug 1516 - create an empty entry right after ".." then split dir
-	mkdir $DIR/d51
-	touch $DIR/d51/foo
-	$MCREATE $DIR/d51/bar
-	rm $DIR/d51/foo
-	createmany -m $DIR/d51/longfile 201
+	test_mkdir -p $DIR/$tdir
+	touch $DIR/$tdir/foo
+	$MCREATE $DIR/$tdir/bar
+	rm $DIR/$tdir/foo
+	createmany -m $DIR/$tdir/longfile 201
 	FNUM=202
-	while [ `ls -sd $DIR/d51 | awk '{ print $1 }'` -eq 4 ]; do
-		$MCREATE $DIR/d51/longfile$FNUM
+	while [ `ls -sd $DIR/$tdir | awk '{ print $1 }'` -eq 4 ]; do
+		$MCREATE $DIR/$tdir/longfile$FNUM
 		FNUM=$(($FNUM + 1))
 		echo -n "+"
 	done
 	echo
-	ls -l $DIR/d51 > /dev/null || error
+	ls -l $DIR/$tdir > /dev/null || error
 }
 run_test 51a "special situations: split htree with empty entry =="
 
 export NUMTEST=70000
 test_51b() {
-	NUMFREE=`df -i -P $DIR | tail -n 1 | awk '{ print $4 }'`
-	[ $NUMFREE -lt 21000 ] && \
-		skip "not enough free inodes ($NUMFREE)" && \
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
+	local BASE=$DIR/$tdir
+
+	# cleanup the directory
+	rm -fr $BASE
+
+	test_mkdir -p $BASE
+
+	local mdtidx=$(printf "%04x" $($LFS getstripe -M $BASE))
+	local numfree=$(lctl get_param -n mdc.$FSNAME-MDT$mdtidx*.filesfree)
+	[ $numfree -lt 21000 ] && skip "not enough free inodes ($numfree)" &&
 		return
 
-	[ $NUMFREE -lt $NUMTEST ] && NUMTEST=$(($NUMFREE - 50))
+	[ $numfree -lt $NUMTEST ] && NUMTEST=$(($numfree - 50)) &&
+		echo "reduced count to $NUMTEST due to inodes"
+
+	# need to check free space for the directories as well
+	local blkfree=$(lctl get_param -n mdc.$FSNAME-MDT$mdtidx*.kbytesavail)
+	numfree=$((blkfree / 4))
+	[ $numfree -lt $NUMTEST ] && NUMTEST=$(($numfree - 50)) &&
+		echo "reduced count to $NUMTEST due to blocks"
 
-	mkdir -p $DIR/d51b
-	createmany -d $DIR/d51b/t- $NUMTEST
+	createmany -d $BASE/d $NUMTEST && echo $NUMTEST > $BASE/fnum ||
+		echo "failed" > $BASE/fnum
 }
-run_test 51b "mkdir .../t-0 --- .../t-$NUMTEST ===================="
+run_test 51b "exceed 64k subdirectory nlink limit"
 
 test_51ba() { # LU-993
-	local BASE=$DIR/d51b
+	local BASE=$DIR/$tdir
 	# unlink all but 100 subdirectories, then check it still works
 	local LEFT=100
+	[ -f $BASE/fnum ] && local NUMPREV=$(cat $BASE/fnum) && rm $BASE/fnum
+
+	[ "$NUMPREV" != "failed" ] && NUMTEST=$NUMPREV
 	local DELETE=$((NUMTEST - LEFT))
 
 	# continue on to run this test even if 51b didn't finish,
 	# just to delete the many subdirectories created.
-	! [ -d "${BASE}/t-1" ] && skip "test_51b() not run" && return 0
+	[ ! -d "${BASE}/d1" ] && skip "test_51b() not run" && return 0
 
 	# for ldiskfs the nlink count should be 1, but this is OSD specific
 	# and so this is listed for informational purposes only
-	log "nlink before: $(stat -c %h $BASE)"
-	unlinkmany -d $BASE/t- $DELETE ||
-		error "unlink of first $DELETE subdirs failed"
+	echo "nlink before: $(stat -c %h $BASE), created before: $NUMTEST"
+	unlinkmany -d $BASE/d $DELETE
+	RC=$?
+
+	if [ $RC -ne 0 ]; then
+		if [ "$NUMPREV" == "failed" ]; then
+			skip "previous setup failed"
+			return 0
+		else
+			error "unlink of first $DELETE subdirs failed"
+			return $RC
+		fi
+	fi
 
-	log "nlink between: $(stat -c %h $BASE)"
-	local FOUND=$(ls -l ${BASE} | wc -l)
-	FOUND=$((FOUND - 1))  # trim the first line of ls output
+	echo "nlink between: $(stat -c %h $BASE)"
+	# trim the first line of ls output
+	local FOUND=$(($(ls -l ${BASE} | wc -l) - 1))
 	[ $FOUND -ne $LEFT ] &&
 		error "can't find subdirs: found only $FOUND/$LEFT"
 
-	unlinkmany -d $BASE/t- $DELETE $LEFT ||
+	unlinkmany -d $BASE/d $DELETE $LEFT ||
 		error "unlink of second $LEFT subdirs failed"
-	log "nlink after: $(stat -c %h $BASE)"
-}
-run_test 51ba "rmdir .../t-0 --- .../t-$NUMTEST"
-
-test_51bb() {
-	[ $MDSCOUNT -lt 2 ] && skip "needs >= 2 MDTs" && return
-
-	local ndirs=${TEST51BB_NDIRS:-10}
-	local nfiles=${TEST51BB_NFILES:-100}
-
-	local numfree=`df -i -P $DIR | tail -n 1 | awk '{ print $4 }'`
-
-	[ $numfree -lt $(( ndirs * nfiles)) ] && \
-		nfiles=$(( numfree / ndirs - 10 ))
-
-	local dir=$DIR/d51bb
-	mkdir -p $dir
-	local savePOLICY=$(lctl get_param -n lmv.*.placement)
-	lctl set_param -n lmv.*.placement=CHAR
-
-	lfs df -i $dir
-	local IUSED=$(lfs df -i $dir | grep MDT | awk '{print $3}')
-	OLDUSED=($IUSED)
-
-	declare -a dirs
-	for ((i=0; i < $ndirs; i++)); do
-		dirs[i]=$dir/$RANDOM
-		echo Creating directory ${dirs[i]}
-		mkdir -p ${dirs[i]}
-		ls $dir
-		echo Creating $nfiles in dir ${dirs[i]} ...
-		echo "createmany -o ${dirs[i]}/$tfile- $nfiles"
-		createmany -o ${dirs[i]}/$tfile- $nfiles
-	done
-	ls $dir
-
-	sleep 1
-
-	IUSED=$(lfs df -i $dir | grep MDT | awk '{print $3}')
-	NEWUSED=($IUSED)
-
-	local rc=0
-	for ((i=0; i<${#NEWUSED[@]}; i++)); do
-		echo "mds $i: inodes count OLD ${OLDUSED[$i]} NEW ${NEWUSED[$i]}"
-		[ ${OLDUSED[$i]} -lt ${NEWUSED[$i]} ] || rc=$((rc + 1))
-	done
-
-	lctl set_param -n lmv.*.placement=$savePOLICY
-
-	[ $rc -ne $MDSCOUNT ] || \
-		error "Objects/inodes are not distributed over all mds servers"
+	# regardless of whether the backing filesystem tracks nlink accurately
+	# or not, the nlink count shouldn't be more than "." and ".." here
+	local AFTER=$(stat -c %h $BASE)
+	[ $AFTER -gt 2 ] && error "nlink after: $AFTER > 2" ||
+		echo "nlink after: $AFTER"
 }
-run_test 51bb "mkdir createmany CMD $MDSCOUNT  ===================="
+run_test 51ba "verify nlink for many subdirectory cleanup"
 
 test_51d() {
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
         [  "$OSTCOUNT" -lt "3" ] && skip_env "skipping test with few OSTs" && return
-        mkdir -p $DIR/d51d
-        createmany -o $DIR/d51d/t- 1000
-        $GETSTRIPE $DIR/d51d > $TMP/files
+        test_mkdir -p $DIR/$tdir
+        createmany -o $DIR/$tdir/t- 1000
+        $GETSTRIPE $DIR/$tdir > $TMP/files
         for N in `seq 0 $((OSTCOUNT - 1))`; do
 	    OBJS[$N]=`awk -vobjs=0 '($1 == '$N') { objs += 1 } END { print objs;}' $TMP/files`
 	    OBJS0[$N]=`grep -A 1 idx $TMP/files | awk -vobjs=0 '($1 == '$N') { objs += 1 } END { print objs;}'`
 	    log "OST$N has ${OBJS[$N]} objects, ${OBJS0[$N]} are index 0"
         done
-        unlinkmany $DIR/d51d/t- 1000
+        unlinkmany $DIR/$tdir/t- 1000
 
         NLAST=0
         for N in `seq 1 $((OSTCOUNT - 1))`; do
@@ -3256,44 +3604,49 @@ test_51d() {
 run_test 51d "check object distribution ===================="
 
 test_52a() {
-	[ -f $DIR/d52a/foo ] && chattr -a $DIR/d52a/foo
-	mkdir -p $DIR/d52a
-	touch $DIR/d52a/foo
-	chattr +a $DIR/d52a/foo || error "chattr +a failed"
-	echo bar >> $DIR/d52a/foo || error "append bar failed"
-	cp /etc/hosts $DIR/d52a/foo && error "cp worked"
-	rm -f $DIR/d52a/foo 2>/dev/null && error "rm worked"
-	link $DIR/d52a/foo $DIR/d52a/foo_link 2>/dev/null && error "link worked"
-	echo foo >> $DIR/d52a/foo || error "append foo failed"
-	mrename $DIR/d52a/foo $DIR/d52a/foo_ren && error "rename worked"
-	lsattr $DIR/d52a/foo | egrep -q "^-+a[-e]+ $DIR/d52a/foo" || error "lsattr"
-	chattr -a $DIR/d52a/foo || error "chattr -a failed"
-        cp -r $DIR/d52a /tmp/
-	rm -fr $DIR/d52a || error "cleanup rm failed"
+	[ -f $DIR/$tdir/foo ] && chattr -a $DIR/$tdir/foo
+	test_mkdir -p $DIR/$tdir
+	touch $DIR/$tdir/foo
+	chattr +a $DIR/$tdir/foo || error "chattr +a failed"
+	echo bar >> $DIR/$tdir/foo || error "append bar failed"
+	cp /etc/hosts $DIR/$tdir/foo && error "cp worked"
+	rm -f $DIR/$tdir/foo 2>/dev/null && error "rm worked"
+	link $DIR/$tdir/foo $DIR/$tdir/foo_link 2>/dev/null &&
+					error "link worked"
+	echo foo >> $DIR/$tdir/foo || error "append foo failed"
+	mrename $DIR/$tdir/foo $DIR/$tdir/foo_ren && error "rename worked"
+	lsattr $DIR/$tdir/foo | egrep -q "^-+a[-e]+ $DIR/$tdir/foo" ||
+						     error "lsattr"
+	chattr -a $DIR/$tdir/foo || error "chattr -a failed"
+        cp -r $DIR/$tdir /tmp/
+	rm -fr $DIR/$tdir || error "cleanup rm failed"
 }
 run_test 52a "append-only flag test (should return errors) ====="
 
 test_52b() {
-	[ -f $DIR/d52b/foo ] && chattr -i $DIR/d52b/foo
-	mkdir -p $DIR/d52b
-	touch $DIR/d52b/foo
-	chattr +i $DIR/d52b/foo || error "chattr +i failed"
-	cat test > $DIR/d52b/foo && error "cat test worked"
-	cp /etc/hosts $DIR/d52b/foo && error "cp worked"
-	rm -f $DIR/d52b/foo 2>/dev/null && error "rm worked"
-	link $DIR/d52b/foo $DIR/d52b/foo_link 2>/dev/null && error  "link worked"
-	echo foo >> $DIR/d52b/foo && error "echo worked"
-	mrename $DIR/d52b/foo $DIR/d52b/foo_ren && error "rename worked"
-	[ -f $DIR/d52b/foo ] || error
-	[ -f $DIR/d52b/foo_ren ] && error
-	lsattr $DIR/d52b/foo | egrep -q "^-+i[-e]+ $DIR/d52b/foo" || error "lsattr"
-	chattr -i $DIR/d52b/foo || error "chattr failed"
-
-	rm -fr $DIR/d52b || error
+	[ -f $DIR/$tdir/foo ] && chattr -i $DIR/$tdir/foo
+	test_mkdir -p $DIR/$tdir
+	touch $DIR/$tdir/foo
+	chattr +i $DIR/$tdir/foo || error "chattr +i failed"
+	cat test > $DIR/$tdir/foo && error "cat test worked"
+	cp /etc/hosts $DIR/$tdir/foo && error "cp worked"
+	rm -f $DIR/$tdir/foo 2>/dev/null && error "rm worked"
+	link $DIR/$tdir/foo $DIR/$tdir/foo_link 2>/dev/null &&
+					error "link worked"
+	echo foo >> $DIR/$tdir/foo && error "echo worked"
+	mrename $DIR/$tdir/foo $DIR/$tdir/foo_ren && error "rename worked"
+	[ -f $DIR/$tdir/foo ] || error
+	[ -f $DIR/$tdir/foo_ren ] && error
+	lsattr $DIR/$tdir/foo | egrep -q "^-+i[-e]+ $DIR/$tdir/foo" ||
+							error "lsattr"
+	chattr -i $DIR/$tdir/foo || error "chattr failed"
+
+	rm -fr $DIR/$tdir || error
 }
 run_test 52b "immutable flag test (should return errors) ======="
 
 test_53() {
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	remote_mds_nodsh && skip "remote MDS with nodsh" && return
 	remote_ost_nodsh && skip "remote OST with nodsh" && return
 
@@ -3302,6 +3655,7 @@ test_53() {
 	local mds_last
 	local ost_last
 	local ostnum
+	local node
 
 	# only test MDT0000
         local mdtosc=$(get_mdtosc_proc_path $SINGLEMDS)
@@ -3309,8 +3663,10 @@ test_53() {
                 param=`echo ${value[0]} | cut -d "=" -f1`
                 ostname=`echo $param | cut -d "." -f2 | cut -d - -f 1-2`
                 mds_last=$(do_facet $SINGLEMDS lctl get_param -n $param)
-                ostnum=$(echo $ostname | sed "s/${FSNAME}-OST//g" | awk '{print ($1+1)}' )
-                ost_last=$(do_facet ost$ostnum lctl get_param -n obdfilter.$ostname.last_id | head -n 1)
+		ostnum=$(index_from_ostuuid ${ostname}_UUID)
+		node=$(facet_active_host ost$((ostnum+1)))
+		param="obdfilter.$ostname.last_id"
+		ost_last=$(do_node $node lctl get_param -n $param | head -n 1)
                 echo "$ostname.last_id=$ost_last ; MDS.last_id=$mds_last"
                 if [ $ost_last != $mds_last ]; then
                     error "$ostname.last_id=$ost_last ; MDS.last_id=$mds_last"
@@ -3350,6 +3706,7 @@ find_loop_dev() {
 }
 
 test_54c() {
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	tfile="$DIR/f54c"
 	tdir="$DIR/d54c"
 	loopdev="$DIR/loop54c"
@@ -3361,7 +3718,7 @@ test_54c() {
 	dd if=/dev/zero of=$tfile bs=`page_size` seek=1024 count=1 > /dev/null
 	losetup $loopdev $tfile || error "can't set up $loopdev for $tfile"
 	mkfs.ext2 $loopdev || error "mke2fs on $loopdev"
-	mkdir -p $tdir
+	test_mkdir -p $tdir
 	mount -t ext2 $loopdev $tdir || error "error mounting $loopdev on $tdir"
 	dd if=/dev/zero of=$tdir/tmp bs=`page_size` count=30 || error "dd write"
 	df $tdir
@@ -3393,41 +3750,43 @@ run_test 54e "console/tty device works in lustre ======================"
 #run_test 55 "check iopen_connect_dentry() ======================"
 
 test_56a() {	# was test_56
-        rm -rf $DIR/d56
+        rm -rf $DIR/$tdir
         $SETSTRIPE -d $DIR
-        mkdir $DIR/d56
-        mkdir $DIR/d56/dir
+	test_mkdir $DIR/$tdir
+        test_mkdir $DIR/$tdir/dir
         NUMFILES=3
         NUMFILESx2=$(($NUMFILES * 2))
         for i in `seq 1 $NUMFILES` ; do
-                touch $DIR/d56/file$i
-                touch $DIR/d56/dir/file$i
+                touch $DIR/$tdir/file$i
+                touch $DIR/$tdir/dir/file$i
         done
 
         # test lfs getstripe with --recursive
-        FILENUM=`$GETSTRIPE --recursive $DIR/d56 | grep -c obdidx`
+        FILENUM=`$GETSTRIPE --recursive $DIR/$tdir | grep -c obdidx`
         [ $FILENUM -eq $NUMFILESx2 ] ||
                 error "$GETSTRIPE --recursive: found $FILENUM, not $NUMFILESx2"
-        FILENUM=`$GETSTRIPE $DIR/d56 | grep -c obdidx`
+        FILENUM=`$GETSTRIPE $DIR/$tdir | grep -c obdidx`
         [ $FILENUM -eq $NUMFILES ] ||
-                error "$GETSTRIPE $DIR/d56: found $FILENUM, not $NUMFILES"
+                error "$GETSTRIPE $DIR/$tdir: found $FILENUM, not $NUMFILES"
         echo "$GETSTRIPE --recursive passed."
 
         # test lfs getstripe with file instead of dir
-        FILENUM=`$GETSTRIPE $DIR/d56/file1 | grep -c obdidx`
+        FILENUM=`$GETSTRIPE $DIR/$tdir/file1 | grep -c obdidx`
         [ $FILENUM  -eq 1 ] || error \
-                 "$GETSTRIPE $DIR/d56/file1: found $FILENUM, not 1"
+                 "$GETSTRIPE $DIR/$tdir/file1: found $FILENUM, not 1"
         echo "$GETSTRIPE file1 passed."
 
         #test lfs getstripe with --verbose
-        [ `$GETSTRIPE --verbose $DIR/d56 | grep -c lmm_magic` -eq $NUMFILES ] ||
-                error "$GETSTRIPE --verbose $DIR/d56: want $NUMFILES lmm_magic"
-        [ `$GETSTRIPE $DIR/d56 | grep -c lmm_magic` -eq 0 ] ||
-            error "$GETSTRIPE $DIR/d56: showed lmm_magic"
+        [ `$GETSTRIPE --verbose $DIR/$tdir |
+			grep -c lmm_magic` -eq $NUMFILES ] ||
+                error "$GETSTRIPE --verbose $DIR/$tdir: want $NUMFILES"
+        [ `$GETSTRIPE $DIR/$tdir | grep -c lmm_magic` -eq 0 ] ||
+            error "$GETSTRIPE $DIR/$tdir: showed lmm_magic"
         echo "$GETSTRIPE --verbose passed."
 
         #test lfs getstripe with --obd
-        $GETSTRIPE --obd wrong_uuid $DIR/d56 2>&1 | grep -q "unknown obduuid" ||
+        $GETSTRIPE --obd wrong_uuid $DIR/$tdir 2>&1 |
+					grep -q "unknown obduuid" ||
                 error "$GETSTRIPE --obd wrong_uuid should return error message"
 
         [  "$OSTCOUNT" -lt 2 ] &&
@@ -3435,11 +3794,11 @@ test_56a() {	# was test_56
 
         OSTIDX=1
         OBDUUID=$(ostuuid_from_index $OSTIDX)
-        FILENUM=`$GETSTRIPE -ir $DIR/d56 | grep -x $OSTIDX | wc -l`
-        FOUND=`$GETSTRIPE -r --obd $OBDUUID $DIR/d56 | grep obdidx | wc -l`
+        FILENUM=`$GETSTRIPE -ir $DIR/$tdir | grep -x $OSTIDX | wc -l`
+        FOUND=`$GETSTRIPE -r --obd $OBDUUID $DIR/$tdir | grep obdidx | wc -l`
         [ $FOUND -eq $FILENUM ] ||
                 error "$GETSTRIPE --obd wrong: found $FOUND, expected $FILENUM"
-        [ `$GETSTRIPE -r -v --obd $OBDUUID $DIR/d56 |
+        [ `$GETSTRIPE -r -v --obd $OBDUUID $DIR/$tdir |
                 sed '/^[	 ]*'${OSTIDX}'[	 ]/d' |
                 sed -n '/^[	 ]*[0-9][0-9]*[	 ]/p' | wc -l` -eq 0 ] ||
                 error "$GETSTRIPE --obd: should not show file on other obd"
@@ -3455,13 +3814,13 @@ setup_56() {
         local MKDIR_PARAMS="$3"
 
         if [ ! -d "$TDIR" ] ; then
-                mkdir -p $TDIR
+                test_mkdir -p $TDIR
                 [ "$MKDIR_PARAMS" ] && $SETSTRIPE $MKDIR_PARAMS $TDIR
                 for i in `seq 1 $LOCAL_NUMFILES` ; do
                         touch $TDIR/file$i
                 done
                 for i in `seq 1 $LOCAL_NUMDIRS` ; do
-                        mkdir $TDIR/dir$i
+                        test_mkdir $TDIR/dir$i
                         for j in `seq 1 $LOCAL_NUMFILES` ; do
                                 touch $TDIR/dir$i/file$j
                         done
@@ -3523,7 +3882,7 @@ run_test 56h "check lfs find ! -name ============================="
 
 test_56i() {
        tdir=${tdir}i
-       mkdir -p $DIR/$tdir
+       test_mkdir -p $DIR/$tdir
        UUID=$(ostuuid_from_index 0 $DIR/$tdir)
        CMD="$LFIND -ost $UUID $DIR/$tdir"
        OUT=$($CMD)
@@ -3879,7 +4238,8 @@ check_stripe_count() {
 }
 
 test_56w() {
-    TDIR=$DIR/${tdir}w
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
+	TDIR=$DIR/${tdir}w
 
     rm -rf $TDIR || error "remove $TDIR failed"
     setup_56 $NUMFILES $NUMDIRS "-c $OSTCOUNT"
@@ -3955,7 +4315,13 @@ test_56w() {
 run_test 56w "check lfs_migrate -c stripe_count works"
 
 test_57a() {
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	# note test will not do anything if MDS is not local
+	if [ "$(facet_fstype $SINGLEMDS)" != ldiskfs ]; then
+		skip "Only applicable to ldiskfs-based MDTs"
+		return
+	fi
+
 	remote_mds_nodsh && skip "remote MDS with nodsh" && return
 	local MNTDEV="osd*.*MDT*.mntdev"
 	DEV=$(do_facet $SINGLEMDS lctl get_param -n $MNTDEV)
@@ -3971,6 +4337,12 @@ test_57a() {
 run_test 57a "verify MDS filesystem created with large inodes =="
 
 test_57b() {
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
+	if [ "$(facet_fstype $SINGLEMDS)" != ldiskfs ]; then
+		skip "Only applicable to ldiskfs-based MDTs"
+		return
+	fi
+
 	remote_mds_nodsh && skip "remote MDS with nodsh" && return
 	local dir=$DIR/d57b
 
@@ -3979,7 +4351,7 @@ test_57b() {
 	local FILEN=$dir/f$FILECOUNT
 
 	rm -rf $dir || error "removing $dir"
-	mkdir -p $dir || error "creating $dir"
+	test_mkdir -p $dir || error "creating $dir"
 	local num=$(get_mds_dir $dir)
 	local mymds=mds$num
 
@@ -4025,24 +4397,28 @@ test_57b() {
 run_test 57b "default LOV EAs are stored inside large inodes ==="
 
 test_58() {
-    [ -z "$(which wiretest 2>/dev/null)" ] && skip_env "could not find wiretest" && return
-    wiretest
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
+	[ -z "$(which wiretest 2>/dev/null)" ] &&
+			skip_env "could not find wiretest" && return
+	wiretest
 }
 run_test 58 "verify cross-platform wire constants =============="
 
 test_59() {
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	echo "touch 130 files"
 	createmany -o $DIR/f59- 130
 	echo "rm 130 files"
 	unlinkmany $DIR/f59- 130
 	sync
-	sleep 2
-        # wait for commitment of removal
+	# wait for commitment of removal
+	wait_delete_completed
 }
 run_test 59 "verify cancellation of llog records async ========="
 
 TEST60_HEAD="test_60 run $RANDOM"
 test_60a() {
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	remote_mgs_nodsh && skip "remote MGS with nodsh" && return
         [ ! -f run-llog.sh ] && skip_env "missing subtest run-llog.sh" && return
 	log "$TEST60_HEAD - from kernel mode"
@@ -4051,6 +4427,7 @@ test_60a() {
 run_test 60a "llog sanity tests run from kernel module =========="
 
 test_60b() { # bug 6411
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	dmesg > $DIR/$tfile
 	LLOG_COUNT=`dmesg | awk "/$TEST60_HEAD/{marker = 1; from_marker = 0;}
 				 /llog.test/ {
@@ -4069,6 +4446,7 @@ test_60b() { # bug 6411
 run_test 60b "limit repeated messages from CERROR/CWARN ========"
 
 test_60c() {
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	echo "create 5000 files"
 	createmany -o $DIR/f60c- 5000
 #define OBD_FAIL_MDS_LLOG_CREATE_FAILED  0x137
@@ -4079,6 +4457,7 @@ test_60c() {
 run_test 60c "unlink file when mds full"
 
 test_60d() {
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	SAVEPRINTK=$(lctl get_param -n printk)
 
 	# verify "lctl mark" is even working"
@@ -4098,6 +4477,7 @@ test_60d() {
 run_test 60d "test printk console message masking"
 
 test_61() {
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	f="$DIR/f61"
 	dd if=/dev/zero of=$f bs=`page_size` count=1
 	cancel_lru_locks osc
@@ -4108,6 +4488,7 @@ run_test 61 "mmap() writes don't make sync hang ================"
 
 # bug 2330 - insufficient obd_match error checking causes LBUG
 test_62() {
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
         f="$DIR/f62"
         echo foo > $f
         cancel_lru_locks osc
@@ -4121,6 +4502,7 @@ test_62() {
 
 # bug 2319 - oig_wait() interrupted causes crash because of invalid waitq.
 test_63a() {	# was test_63
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	MAX_DIRTY_MB=`lctl get_param -n osc.*.max_dirty_mb | head -n 1`
 	lctl set_param -n osc.*.max_dirty_mb 0
 	for i in `seq 10` ; do
@@ -4138,6 +4520,7 @@ run_test 63a "Verify oig_wait interruption does not crash ======="
 # bug 2248 - async write errors didn't return to application on sync
 # bug 3677 - async write errors left page locked
 test_63b() {
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	debugsave
 	lctl set_param debug=-1
 
@@ -4157,46 +4540,58 @@ test_63b() {
 run_test 63b "async write errors should be returned to fsync ==="
 
 test_64a () {
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	df $DIR
 	lctl get_param -n osc.*[oO][sS][cC][_-]*.cur* | grep "[0-9]"
 }
 run_test 64a "verify filter grant calculations (in kernel) ====="
 
 test_64b () {
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	[ ! -f oos.sh ] && skip_env "missing subtest oos.sh" && return
 	sh oos.sh $MOUNT
 }
 run_test 64b "check out-of-space detection on client ==========="
 
+test_64c() {
+	$LCTL set_param osc.*OST0000-osc-[^mM]*.cur_grant_bytes=0
+}
+run_test 64c "verify grant shrink ========================------"
+
 # bug 1414 - set/get directories' stripe info
 test_65a() {
-	mkdir -p $DIR/d65
-	touch $DIR/d65/f1
-	$LVERIFY $DIR/d65 $DIR/d65/f1 || error "lverify failed"
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
+	test_mkdir -p $DIR/$tdir
+	touch $DIR/$tdir/f1
+	$LVERIFY $DIR/$tdir $DIR/$tdir/f1 || error "lverify failed"
 }
 run_test 65a "directory with no stripe info ===================="
 
 test_65b() {
-	mkdir -p $DIR/d65
-	$SETSTRIPE -S $((STRIPESIZE * 2)) -i 0 -c 1 $DIR/d65||error "setstripe"
-	touch $DIR/d65/f2
-	$LVERIFY $DIR/d65 $DIR/d65/f2 || error "lverify failed"
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
+	test_mkdir -p $DIR/$tdir
+	$SETSTRIPE -S $((STRIPESIZE * 2)) -i 0 -c 1 $DIR/$tdir ||
+						error "setstripe"
+	touch $DIR/$tdir/f2
+	$LVERIFY $DIR/$tdir $DIR/$tdir/f2 || error "lverify failed"
 }
 run_test 65b "directory setstripe -S $((STRIPESIZE * 2)) -i 0 -c 1"
 
 test_65c() {
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	if [ $OSTCOUNT -gt 1 ]; then
-		mkdir -p $DIR/d65
+		test_mkdir -p $DIR/$tdir
 		$SETSTRIPE -S $(($STRIPESIZE * 4)) -i 1 \
-			-c $(($OSTCOUNT - 1)) $DIR/d65 || error "setstripe"
-		touch $DIR/d65/f3
-		$LVERIFY $DIR/d65 $DIR/d65/f3 || error "lverify failed"
+			-c $(($OSTCOUNT - 1)) $DIR/$tdir || error "setstripe"
+		touch $DIR/$tdir/f3
+		$LVERIFY $DIR/$tdir $DIR/$tdir/f3 || error "lverify failed"
 	fi
 }
 run_test 65c "directory setstripe -S $((STRIPESIZE*4)) -i 1 -c $((OSTCOUNT-1))"
 
 test_65d() {
-	mkdir -p $DIR/d65
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
+	test_mkdir -p $DIR/$tdir
 	if [ $STRIPECOUNT -le 0 ]; then
 		sc=1
 	elif [ $STRIPECOUNT -gt 2000 ]; then
@@ -4205,67 +4600,80 @@ test_65d() {
 	else
 		sc=$(($STRIPECOUNT - 1))
 	fi
-	$SETSTRIPE -S $STRIPESIZE -c $sc $DIR/d65 || error "setstripe"
-	touch $DIR/d65/f4 $DIR/d65/f5
-	$LVERIFY $DIR/d65 $DIR/d65/f4 $DIR/d65/f5 || error "lverify failed"
+	$SETSTRIPE -S $STRIPESIZE -c $sc $DIR/$tdir || error "setstripe"
+	touch $DIR/$tdir/f4 $DIR/$tdir/f5
+	$LVERIFY $DIR/$tdir $DIR/$tdir/f4 $DIR/$tdir/f5 ||
+						error "lverify failed"
 }
 run_test 65d "directory setstripe -S $STRIPESIZE -c stripe_count"
 
 test_65e() {
-	mkdir -p $DIR/d65
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
+	test_mkdir -p $DIR/$tdir
 
-	$SETSTRIPE $DIR/d65 || error "setstripe"
-        $GETSTRIPE -v $DIR/d65 | grep "Default" || error "no stripe info failed"
-	touch $DIR/d65/f6
-	$LVERIFY $DIR/d65 $DIR/d65/f6 || error "lverify failed"
+	$SETSTRIPE $DIR/$tdir || error "setstripe"
+        $GETSTRIPE -v $DIR/$tdir | grep "Default" ||
+					error "no stripe info failed"
+	touch $DIR/$tdir/f6
+	$LVERIFY $DIR/$tdir $DIR/$tdir/f6 || error "lverify failed"
 }
 run_test 65e "directory setstripe defaults ======================="
 
 test_65f() {
-	mkdir -p $DIR/d65f
-	$RUNAS $SETSTRIPE $DIR/d65f && error "setstripe succeeded" || true
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
+	test_mkdir -p $DIR/${tdir}f
+	$RUNAS $SETSTRIPE $DIR/${tdir}f && error "setstripe succeeded" || true
 }
 run_test 65f "dir setstripe permission (should return error) ==="
 
 test_65g() {
-        mkdir -p $DIR/d65
-        $SETSTRIPE -S $((STRIPESIZE * 2)) -i 0 -c 1 $DIR/d65 ||error "setstripe"
-        $SETSTRIPE -d $DIR/d65 || error "setstripe"
-        $GETSTRIPE -v $DIR/d65 | grep "Default" || \
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
+        test_mkdir -p $DIR/$tdir
+        $SETSTRIPE -S $((STRIPESIZE * 2)) -i 0 -c 1 $DIR/$tdir ||
+							error "setstripe"
+        $SETSTRIPE -d $DIR/$tdir || error "setstripe"
+        $GETSTRIPE -v $DIR/$tdir | grep "Default" ||
 		error "delete default stripe failed"
 }
 run_test 65g "directory setstripe -d ==========================="
 
 test_65h() {
-        mkdir -p $DIR/d65
-        $SETSTRIPE -S $((STRIPESIZE * 2)) -i 0 -c 1 $DIR/d65 ||error "setstripe"
-        mkdir -p $DIR/d65/dd1
-        [ $($GETSTRIPE -c $DIR/d65) == $($GETSTRIPE -c $DIR/d65/dd1) ] ||
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
+        test_mkdir -p $DIR/$tdir
+        $SETSTRIPE -S $((STRIPESIZE * 2)) -i 0 -c 1 $DIR/$tdir ||
+							error "setstripe"
+        test_mkdir -p $DIR/$tdir/dd1
+        [ $($GETSTRIPE -c $DIR/$tdir) == $($GETSTRIPE -c $DIR/$tdir/dd1) ] ||
                 error "stripe info inherit failed"
 }
 run_test 65h "directory stripe info inherit ===================="
 
 test_65i() { # bug6367
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
         $SETSTRIPE -S 65536 -c -1 $MOUNT
 }
 run_test 65i "set non-default striping on root directory (bug 6367)="
 
 test_65ia() { # bug12836
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	$GETSTRIPE $MOUNT || error "getstripe $MOUNT failed"
 }
 run_test 65ia "getstripe on -1 default directory striping"
 
 test_65ib() { # bug12836
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	$GETSTRIPE -v $MOUNT || error "getstripe -v $MOUNT failed"
 }
 run_test 65ib "getstripe -v on -1 default directory striping"
 
 test_65ic() { # bug12836
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	$LFS find -mtime -1 $MOUNT > /dev/null || error "find $MOUNT failed"
 }
 run_test 65ic "new find on -1 default directory striping"
 
 test_65j() { # bug6367
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	sync; sleep 1
 	# if we aren't already remounting for each test, do so for this test
 	if [ "$CLEANUP" = ":" -a "$I_MOUNTED" = "yes" ]; then
@@ -4277,8 +4685,9 @@ test_65j() { # bug6367
 run_test 65j "set default striping on root directory (bug 6367)="
 
 test_65k() { # bug11679
-    [ "$OSTCOUNT" -lt 2 ] && skip_env "too few OSTs" && return
-    remote_mds_nodsh && skip "remote MDS with nodsh" && return
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
+	[ "$OSTCOUNT" -lt 2 ] && skip_env "too few OSTs" && return
+	remote_mds_nodsh && skip "remote MDS with nodsh" && return
 
     echo "Check OST status: "
     local MDS_OSCS=`do_facet $SINGLEMDS lctl dl |
@@ -4289,7 +4698,7 @@ test_65k() { # bug11679
         do_facet $SINGLEMDS lctl --device %$OSC activate
     done
 
-    do_facet client mkdir -p $DIR/$tdir
+    mkdir -p $DIR/$tdir
     for INACTIVE_OSC in $MDS_OSCS; do
         echo "Deactivate: " $INACTIVE_OSC
         do_facet $SINGLEMDS lctl --device %$INACTIVE_OSC deactivate
@@ -4300,11 +4709,11 @@ test_65k() { # bug11679
 
             [ -f $DIR/$tdir/$IDX ] && continue
             echo "$SETSTRIPE -i $IDX -c 1 $DIR/$tdir/$IDX"
-            do_facet client $SETSTRIPE -i $IDX -c 1 $DIR/$tdir/$IDX
+            $SETSTRIPE -i $IDX -c 1 $DIR/$tdir/$IDX
             RC=$?
             [ $RC -ne 0 ] && error "setstripe should have succeeded"
         done
-        do_facet client rm -f $DIR/$tdir/*
+        rm -f $DIR/$tdir/*
         echo $INACTIVE_OSC "is Activate."
         do_facet $SINGLEMDS lctl --device  %$INACTIVE_OSC activate
     done
@@ -4312,7 +4721,8 @@ test_65k() { # bug11679
 run_test 65k "validate manual striping works properly with deactivated OSCs"
 
 test_65l() { # bug 12836
-	mkdir -p $DIR/$tdir/test_dir
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
+	test_mkdir -p $DIR/$tdir/test_dir
 	$SETSTRIPE -c -1 $DIR/$tdir/test_dir
 	$LFS find -mtime -1 $DIR/$tdir >/dev/null
 }
@@ -4320,6 +4730,7 @@ run_test 65l "lfs find on -1 stripe dir ========================"
 
 # bug 2543 - update blocks count on client
 test_66() {
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	COUNT=${COUNT:-8}
 	dd if=/dev/zero of=$DIR/f66 bs=1k count=$COUNT
 	sync; sync_all_data; sync; sync_all_data
@@ -4332,6 +4743,7 @@ run_test 66 "update inode blocks count on client ==============="
 LLOOP=
 LLITELOOPLOAD=
 cleanup_68() {
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	trap 0
 	if [ ! -z "$LLOOP" ]; then
 		if swapon -s | grep -q $LLOOP; then
@@ -4359,6 +4771,7 @@ swap_used() {
 
 # test case for lloop driver, basic function
 test_68a() {
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	[ "$UID" != 0 ] && skip_env "must run as root" && return
 	llite_lloop_enabled || \
  		{ skip_env "llite_lloop module disabled" && return; }
@@ -4388,6 +4801,7 @@ run_test 68a "lloop driver - basic test ========================"
 # excercise swapping to lustre by adding a high priority swapfile entry
 # and then consuming memory until it is used.
 test_68b() {  # was test_68
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	[ "$UID" != 0 ] && skip_env "must run as root" && return
 	lctl get_param -n devices | grep -q obdfilter && \
 		skip "local OST" && return
@@ -4426,6 +4840,7 @@ run_test 68b "support swapping to Lustre ========================"
 # bug5265, obdfilter oa2dentry return -ENOENT
 # #define OBD_FAIL_OST_ENOENT 0x217
 test_69() {
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	remote_ost_nodsh && skip "remote OST with nodsh" && return
 
 	f="$DIR/$tfile"
@@ -4452,12 +4867,13 @@ test_69() {
 run_test 69 "verify oa2dentry return -ENOENT doesn't LBUG ======"
 
 test_71() {
-    mkdir -p $DIR/$tdir
+    test_mkdir -p $DIR/$tdir
     sh rundbench -C -D $DIR/$tdir 2 || error "dbench failed!"
 }
 run_test 71 "Running dbench on lustre (don't segment fault) ===="
 
 test_72a() { # bug 5695 - Test that on 2.6 remove_suid works properly
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	check_kernel_version 43 || return 0
 	[ "$RUNAS_ID" = "$UID" ] && skip_env "RUNAS_ID = UID = $UID -- skipping" && return
 
@@ -4477,7 +4893,6 @@ test_72a() { # bug 5695 - Test that on 2.6 remove_suid works properly
 	# Now test that MDS is updated too
 	cancel_lru_locks mdc
 	test -u $DIR/f72 -o -g $DIR/f72 && error "S/gid is not dropped on MDS"
-	true
 	rm -f $DIR/f72
 }
 run_test 72a "Test that remove suid works properly (bug5695) ===="
@@ -4490,13 +4905,15 @@ test_72b() { # bug 24226 -- keep mode setting when size is not changing
 	[ "$RUNAS_ID" -eq 0 ] && \
 		skip_env "RUNAS_ID = 0 -- skipping" && return
 
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	# Check that testing environment is properly set up. Skip if not
 	FAIL_ON_ERROR=false check_runas_id_ret $RUNAS_ID $RUNAS_ID $RUNAS || {
 		skip_env "User $RUNAS_ID does not exist - skipping"
 		return 0
 	}
 	touch $DIR/${tfile}-f{g,u}
-	mkdir $DIR/${tfile}-d{g,u}
+	test_mkdir $DIR/${tfile}-dg
+	test_mkdir $DIR/${tfile}-du
 	chmod 770 $DIR/${tfile}-{f,d}{g,u}
 	chmod g+s $DIR/${tfile}-{f,d}g
 	chmod u+s $DIR/${tfile}-{f,d}u
@@ -4512,8 +4929,9 @@ run_test 72b "Test that we keep mode setting if without file data changed (bug 2
 
 # bug 3462 - multiple simultaneous MDC requests
 test_73() {
-	mkdir $DIR/d73-1
-	mkdir $DIR/d73-2
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
+	test_mkdir $DIR/d73-1
+	test_mkdir $DIR/d73-2
 	multiop_bg_pause $DIR/d73-1/f73-1 O_c || return 1
 	pid1=$!
 
@@ -4539,6 +4957,7 @@ test_73() {
 run_test 73 "multiple MDC requests (should not deadlock)"
 
 test_74a() { # bug 6149, 6184
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	#define OBD_FAIL_LDLM_ENQUEUE_OLD_EXPORT 0x30e
 	#
 	# very important to OR with OBD_FAIL_ONCE (0x80000000) -- otherwise it
@@ -4554,6 +4973,7 @@ test_74a() { # bug 6149, 6184
 run_test 74a "ldlm_enqueue freed-export error path, ls (shouldn't LBUG)"
 
 test_74b() { # bug 13310
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	#define OBD_FAIL_LDLM_ENQUEUE_OLD_EXPORT 0x30e
 	#
 	# very important to OR with OBD_FAIL_ONCE (0x80000000) -- otherwise it
@@ -4568,6 +4988,7 @@ test_74b() { # bug 13310
 run_test 74b "ldlm_enqueue freed-export error path, touch (shouldn't LBUG)"
 
 test_74c() {
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 #define OBD_FAIL_LDLM_NEW_LOCK
 	lctl set_param fail_loc=0x80000319
 	touch $DIR/$tfile && error "Touch successful"
@@ -4588,6 +5009,7 @@ set_inode_slab_tunables() {
 }
 
 test_76() { # Now for bug 20433, added originally in bug 1443
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	local SLAB_SETTINGS=`get_inode_slab_tunables`
 	local CPUS=`getconf _NPROCESSORS_ONLN`
 	# we cannot set limit below 1 which means 1 inode in each
@@ -4653,6 +5075,7 @@ setup_f77() {
 }
 
 test_77a() { # bug 10889
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	$GSS && skip "could not run with gss" && return
 	[ ! -f $F77_TMP ] && setup_f77
 	set_checksums 1
@@ -4663,6 +5086,7 @@ test_77a() { # bug 10889
 run_test 77a "normal checksum read/write operation ============="
 
 test_77b() { # bug 10889
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	$GSS && skip "could not run with gss" && return
 	[ ! -f $F77_TMP ] && setup_f77
 	#define OBD_FAIL_OSC_CHECKSUM_SEND       0x409
@@ -4676,6 +5100,7 @@ test_77b() { # bug 10889
 run_test 77b "checksum error on client write ===================="
 
 test_77c() { # bug 10889
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	$GSS && skip "could not run with gss" && return
 	[ ! -f $DIR/f77b ] && skip "requires 77b - skipping" && return
 	set_checksums 1
@@ -4694,6 +5119,7 @@ test_77c() { # bug 10889
 run_test 77c "checksum error on client read ==================="
 
 test_77d() { # bug 10889
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	$GSS && skip "could not run with gss" && return
 	#define OBD_FAIL_OSC_CHECKSUM_SEND       0x409
 	lctl set_param fail_loc=0x80000409
@@ -4706,6 +5132,7 @@ test_77d() { # bug 10889
 run_test 77d "checksum error on OST direct write ==============="
 
 test_77e() { # bug 10889
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	$GSS && skip "could not run with gss" && return
 	[ ! -f $DIR/f77 ] && skip "requires 77d - skipping" && return
 	#define OBD_FAIL_OSC_CHECKSUM_RECEIVE    0x408
@@ -4720,6 +5147,7 @@ test_77e() { # bug 10889
 run_test 77e "checksum error on OST direct read ================"
 
 test_77f() { # bug 10889
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	$GSS && skip "could not run with gss" && return
 	set_checksums 1
 	for algo in $CKSUM_TYPES; do
@@ -4737,6 +5165,7 @@ test_77f() { # bug 10889
 run_test 77f "repeat checksum error on write (expect error) ===="
 
 test_77g() { # bug 10889
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	$GSS && skip "could not run with gss" && return
 	remote_ost_nodsh && skip "remote OST with nodsh" && return
 
@@ -4754,6 +5183,7 @@ test_77g() { # bug 10889
 run_test 77g "checksum error on OST write ======================"
 
 test_77h() { # bug 10889
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	$GSS && skip "could not run with gss" && return
 	remote_ost_nodsh && skip "remote OST with nodsh" && return
 
@@ -4769,6 +5199,7 @@ test_77h() { # bug 10889
 run_test 77h "checksum error on OST read ======================="
 
 test_77i() { # bug 13805
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	$GSS && skip "could not run with gss" && return
 	#define OBD_FAIL_OSC_CONNECT_CKSUM       0x40b
 	lctl set_param fail_loc=0x40b
@@ -4784,6 +5215,7 @@ test_77i() { # bug 13805
 run_test 77i "client not supporting OSD_CONNECT_CKSUM =========="
 
 test_77j() { # bug 13805
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	$GSS && skip "could not run with gss" && return
 	#define OBD_FAIL_OSC_CKSUM_ADLER_ONLY    0x40c
 	lctl set_param fail_loc=0x40c
@@ -4804,6 +5236,7 @@ rm -f $F77_TMP
 unset F77_TMP
 
 test_78() { # bug 10901
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	remote_ost || { skip_env "local OST" && return; }
 
 	NSEQ=5
@@ -4846,6 +5279,7 @@ test_78() { # bug 10901
 run_test 78 "handle large O_DIRECT writes correctly ============"
 
 test_79() { # bug 12743
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	wait_delete_completed
 
         BKTOTAL=$(calc_osc_kbytes kbytestotal)
@@ -4876,6 +5310,17 @@ test_79() { # bug 12743
 run_test 79 "df report consistency check ======================="
 
 test_80() { # bug 10718
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
+        # relax strong synchronous semantics for slow backends like ZFS
+        local soc="obdfilter.*.sync_on_lock_cancel"
+        local soc_old=$(do_facet ost1 lctl get_param -n $soc | head -n1)
+        local hosts=
+        if [ "$soc_old" != "never" -a "$(facet_fstype ost1)" != "ldiskfs" ]; then
+                hosts=$(for host in $(seq -f "ost%g" 1 $OSTCOUNT); do
+                          facet_active_host $host; done | sort -u)
+                do_nodes $hosts lctl set_param $soc=never
+        fi
+
         dd if=/dev/zero of=$DIR/$tfile bs=1M count=1 seek=1M
         sync; sleep 1; sync
         local BEFORE=`date +%s`
@@ -4885,16 +5330,19 @@ test_80() { # bug 10718
         if [ $DIFF -gt 1 ] ; then
                 error "elapsed for 1M@1T = $DIFF"
         fi
-        true
+
+        [ -n "$hosts" ] && do_nodes $hosts lctl set_param $soc=$soc_old
+
         rm -f $DIR/$tfile
 }
 run_test 80 "Page eviction is equally fast at high offsets too  ===="
 
 test_81a() { # LU-456
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
         remote_ost_nodsh && skip "remote OST with nodsh" && return
         # define OBD_FAIL_OST_MAPBLK_ENOSPC    0x228
         # MUST OR with the OBD_FAIL_ONCE (0x80000000)
-        do_facet ost0 lctl set_param fail_loc=0x80000228
+        do_facet ost1 lctl set_param fail_loc=0x80000228
 
         # write should trigger a retry and success
         $SETSTRIPE -i 0 -c 1 $DIR/$tfile
@@ -4907,10 +5355,11 @@ test_81a() { # LU-456
 run_test 81a "OST should retry write when get -ENOSPC ==============="
 
 test_81b() { # LU-456
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
         remote_ost_nodsh && skip "remote OST with nodsh" && return
         # define OBD_FAIL_OST_MAPBLK_ENOSPC    0x228
         # Don't OR with the OBD_FAIL_ONCE (0x80000000)
-        do_facet ost0 lctl set_param fail_loc=0x228
+        do_facet ost1 lctl set_param fail_loc=0x228
 
         # write should retry several times and return -ENOSPC finally
         $SETSTRIPE -i 0 -c 1 $DIR/$tfile
@@ -4948,7 +5397,7 @@ run_test 82 "Basic grouplock test ==============================="
 test_99a() {
         [ -z "$(which cvs 2>/dev/null)" ] && skip_env "could not find cvs" && \
 	    return
-	mkdir -p $DIR/d99cvsroot
+	test_mkdir -p $DIR/d99cvsroot
 	chown $RUNAS_ID $DIR/d99cvsroot
 	local oldPWD=$PWD	# bug 13584, use $TMP as working dir
 	cd $TMP
@@ -4975,7 +5424,7 @@ test_99c() {
         [ -z "$(which cvs 2>/dev/null)" ] && skip_env "could not find cvs" && return
 	[ ! -d $DIR/d99cvsroot ] && test_99b
 	cd $DIR
-	mkdir -p $DIR/d99reposname
+	test_mkdir -p $DIR/d99reposname
 	chown $RUNAS_ID $DIR/d99reposname
 	$RUNAS cvs -d $DIR/d99cvsroot co d99reposname
 }
@@ -5008,6 +5457,7 @@ test_99f() {
 run_test 99f "cvs commit ======================================="
 
 test_100() {
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	[ "$NETTYPE" = tcp ] || \
 		{ skip "TCP secure port test, not useful for NETTYPE=$NETTYPE" && \
 			return ; }
@@ -5050,13 +5500,16 @@ function get_named_value()
     done
 }
 
-export CACHE_MAX=`$LCTL get_param -n llite.*.max_cached_mb | head -n 1`
+export CACHE_MAX=$($LCTL get_param -n llite.*.max_cached_mb |
+		   awk '/^max_cached_mb/ { print $2 }')
+
 cleanup_101a() {
 	$LCTL set_param -n llite.*.max_cached_mb $CACHE_MAX
 	trap 0
 }
 
 test_101a() {
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	local s
 	local discard
 	local nreads=10000
@@ -5091,14 +5544,14 @@ test_101a() {
 run_test 101a "check read-ahead for random reads ================"
 
 setup_test101bc() {
-	mkdir -p $DIR/$tdir
+	test_mkdir -p $DIR/$tdir
 	STRIPE_SIZE=1048576
 	STRIPE_COUNT=$OSTCOUNT
 	STRIPE_OFFSET=0
 
 	local list=$(comma_list $(osts_nodes))
-	do_nodes $list $LCTL set_param -n obdfilter.*.read_cache_enable=0
-	do_nodes $list $LCTL set_param -n obdfilter.*.writethrough_cache_enable=0
+	set_osd_param $list '' read_cache_enable 0
+	set_osd_param $list '' writethrough_cache_enable 0
 
 	trap cleanup_test101bc EXIT
 	# prepare the read-ahead file
@@ -5113,8 +5566,8 @@ cleanup_test101bc() {
 	rm -f $DIR/$tfile
 
 	local list=$(comma_list $(osts_nodes))
-	do_nodes $list $LCTL set_param -n obdfilter.*.read_cache_enable=1
-	do_nodes $list $LCTL set_param -n obdfilter.*.writethrough_cache_enable=1
+	set_osd_param $list '' read_cache_enable 1
+	set_osd_param $list '' writethrough_cache_enable 1
 }
 
 calc_total() {
@@ -5141,6 +5594,7 @@ ra_check_101() {
 }
 
 test_101b() {
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	[ "$OSTCOUNT" -lt "2" ] && skip_env "skipping stride IO stride-ahead test" && return
 	local STRIPE_SIZE=1048576
 	local STRIDE_SIZE=$((STRIPE_SIZE*OSTCOUNT))
@@ -5167,10 +5621,11 @@ test_101b() {
 run_test 101b "check stride-io mode read-ahead ================="
 
 test_101c() {
-    local STRIPE_SIZE=1048576
-    local FILE_LENGTH=$((STRIPE_SIZE*100))
-    local nreads=10000
-    local osc
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
+	local STRIPE_SIZE=1048576
+	local FILE_LENGTH=$((STRIPE_SIZE*100))
+	local nreads=10000
+	local osc
 
     setup_test101bc
 
@@ -5213,16 +5668,17 @@ set_read_ahead() {
 }
 
 test_101d() {
-    local file=$DIR/$tfile
-    local size=${FILESIZE_101c:-500}
-    local ra_MB=${READAHEAD_MB:-40}
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
+	local file=$DIR/$tfile
+	local size=${FILESIZE_101c:-500}
+	local ra_MB=${READAHEAD_MB:-40}
 
-    local space=$(df -P $DIR | tail -n 1 | awk '{ print $4 }')
-    [ $space -gt $((size / 1024)) ] ||
-        { skip "Need free space ${size}M, have $space" && return; }
+	local space=$(df -P $DIR | tail -n 1 | awk '{ print $4 }')
+	[ $space -gt $((size * 1024)) ] ||
+		{ skip "Need free space ${size}M, have $space" && return; }
 
     echo Creating ${size}M test file $file
-    dd if=/dev/zero of=$file bs=1M count=$size
+    dd if=/dev/zero of=$file bs=1M count=$size || error "dd failed"
     echo Cancel LRU locks on lustre client to flush the client cache
     cancel_lru_locks osc
 
@@ -5243,8 +5699,9 @@ test_101d() {
     echo read-ahead disabled time read $time_ra_OFF
     echo read-ahead enabled  time read $time_ra_ON
 
-    set_read_ahead $old_READAHEAD
-    rm -f $file
+	set_read_ahead $old_READAHEAD
+	rm -f $file
+	wait_delete_completed
 
     [ $time_ra_ON -lt $time_ra_OFF ] ||
         error "read-ahead enabled  time read (${time_ra_ON}s) is more than
@@ -5253,6 +5710,7 @@ test_101d() {
 run_test 101d "file read with and without read-ahead enabled  ================="
 
 test_101e() {
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
     local file=$DIR/$tfile
     local size=500  #KB
     local count=100
@@ -5297,6 +5755,7 @@ cleanup_test101f() {
 }
 
 test_101f() {
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
     local file=$DIR/$tfile
     local nreads=1000
 
@@ -5326,7 +5785,7 @@ test_101f() {
 run_test 101f "check read-ahead for max_read_ahead_whole_mb"
 
 setup_test102() {
-	mkdir -p $DIR/$tdir
+	test_mkdir -p $DIR/$tdir
 	chown $RUNAS_ID $DIR/$tdir
 	STRIPE_SIZE=65536
 	STRIPE_OFFSET=1
@@ -5446,7 +5905,7 @@ test_102c() {
 	# b10930: get/set/list lustre.lov xattr
 	echo "get/set/list lustre.lov xattr ..."
 	[ "$OSTCOUNT" -lt "2" ] && skip_env "skipping 2-stripe test" && return
-	mkdir -p $DIR/$tdir
+	test_mkdir -p $DIR/$tdir
 	chown $RUNAS_ID $DIR/$tdir
 	local testfile=$DIR/$tdir/$tfile
 	$RUNAS $SETSTRIPE -S 65536 -i 1 -c $OSTCOUNT $testfile ||
@@ -5502,12 +5961,13 @@ find_lustre_tar() {
 }
 
 test_102d() {
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	# b10930: tar test for trusted.lov xattr
 	TAR=$(find_lustre_tar)
 	[ -z "$TAR" ] && skip_env "lustre-aware tar is not installed" && return
 	[ "$OSTCOUNT" -lt "2" ] && skip_env "skipping N-stripe test" && return
 	setup_test102
-	mkdir -p $DIR/d102d
+	test_mkdir -p $DIR/d102d
 	$TAR xf $TMP/f102.tar -C $DIR/d102d --xattrs
 	cd $DIR/d102d/$tdir
 	compare_stripe_info1
@@ -5515,12 +5975,13 @@ test_102d() {
 run_test 102d "tar restore stripe info from tarfile,not keep osts ==========="
 
 test_102f() {
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	# b10930: tar test for trusted.lov xattr
 	TAR=$(find_lustre_tar)
 	[ -z "$TAR" ] && skip_env "lustre-aware tar is not installed" && return
 	[ "$OSTCOUNT" -lt "2" ] && skip_env "skipping N-stripe test" && return
 	setup_test102
-	mkdir -p $DIR/d102f
+	test_mkdir -p $DIR/d102f
 	cd $DIR
 	$TAR cf - --xattrs $tdir | $TAR xf - --xattrs -C $DIR/d102f
 	cd $DIR/d102f/$tdir
@@ -5590,11 +6051,12 @@ test_102i() { # bug 17038
 run_test 102i "lgetxattr test on symbolic link ============"
 
 test_102j() {
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	TAR=$(find_lustre_tar)
 	[ -z "$TAR" ] && skip_env "lustre-aware tar is not installed" && return
 	[ "$OSTCOUNT" -lt "2" ] && skip_env "skipping N-stripe test" && return
 	setup_test102 "$RUNAS"
-	mkdir -p $DIR/d102j
+	test_mkdir -p $DIR/d102j
 	chown $RUNAS_ID $DIR/d102j
 	$RUNAS $TAR xf $TMP/f102.tar -C $DIR/d102j --xattrs
 	cd $DIR/d102j/$tdir
@@ -5608,7 +6070,7 @@ test_102k() {
         setfattr -n trusted.lov $DIR/$tfile
         # b22187 'setfattr -n trusted.lov' should work as remove LOV EA for directories
         local test_kdir=$DIR/d102k
-        mkdir $test_kdir
+        test_mkdir $test_kdir
         local default_size=`$GETSTRIPE -S $test_kdir`
         local default_count=`$GETSTRIPE -c $test_kdir`
         local default_offset=`$GETSTRIPE -i $test_kdir`
@@ -5660,9 +6122,9 @@ test_103 () {
 
     declare -a identity_old
 
-    for num in `seq $MDSCOUNT`; do
-        switch_identity $num true || identity_old[$num]=$?
-    done
+	for num in $(seq $MDSCOUNT); do
+		switch_identity $num true || identity_old[$num]=$?
+	done
 
     SAVE_UMASK=`umask`
     umask 0022
@@ -5686,18 +6148,25 @@ test_103 () {
     run_acl_subtest inheritance || error "inheritance test failed"
     rm -f make-tree
 
+    echo "LU-974 ignore umask when acl is enabled..."
+    run_acl_subtest 974 || error "LU-974 test failed"
+
+    echo "LU-2561 newly created file is same size as directory..."
+    run_acl_subtest 2561 || error "LU-2561 test failed"
+
     cd $SAVE_PWD
     umask $SAVE_UMASK
 
-    for num in `seq $MDSCOUNT`; do
-	if [ "${identity_old[$num]}" = 1 ]; then
-            switch_identity $num false || identity_old[$num]=$?
-	fi
-    done
+	for num in $(seq $MDSCOUNT); do
+		if [ "${identity_old[$num]}" = 1 ]; then
+			switch_identity $num false || identity_old[$num]=$?
+		fi
+	done
 }
 run_test 103 "acl test ========================================="
 
 test_104a() {
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	touch $DIR/$tfile
 	lfs df || error "lfs df failed"
 	lfs df -ih || error "lfs df -ih failed"
@@ -5719,6 +6188,7 @@ test_104a() {
 run_test 104a "lfs df [-ih] [path] test ========================="
 
 test_104b() {
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	[ $RUNAS_ID -eq $UID ] && skip_env "RUNAS_ID = UID = $UID -- skipping" && return
 	chmod 666 /dev/obd
 	denied_cnt=$((`$RUNAS $LFS check servers 2>&1 | grep "Permission denied" | wc -l`))
@@ -5731,53 +6201,51 @@ run_test 104b "$RUNAS lfs check servers test ===================="
 
 test_105a() {
 	# doesn't work on 2.4 kernels
-        touch $DIR/$tfile
-        if [ -n "`mount | grep \"$DIR.*flock\" | grep -v noflock`" ];
-        then
-                flocks_test 1 on -f $DIR/$tfile || error "fail flock on"
-        else
-                flocks_test 1 off -f $DIR/$tfile || error "fail flock off"
-        fi
+	touch $DIR/$tfile
+	if [ -n "`mount | grep \"$MOUNT.*flock\" | grep -v noflock`" ]; then
+		flocks_test 1 on -f $DIR/$tfile || error "fail flock on"
+	else
+		flocks_test 1 off -f $DIR/$tfile || error "fail flock off"
+	fi
 	rm -f $DIR/$tfile
 }
 run_test 105a "flock when mounted without -o flock test ========"
 
 test_105b() {
-        touch $DIR/$tfile
-        if [ -n "`mount | grep \"$DIR.*flock\" | grep -v noflock`" ];
-        then
-                flocks_test 1 on -c $DIR/$tfile || error "fail flock on"
-        else
-                flocks_test 1 off -c $DIR/$tfile || error "fail flock off"
-        fi
+	touch $DIR/$tfile
+	if [ -n "`mount | grep \"$MOUNT.*flock\" | grep -v noflock`" ]; then
+		flocks_test 1 on -c $DIR/$tfile || error "fail flock on"
+	else
+		flocks_test 1 off -c $DIR/$tfile || error "fail flock off"
+	fi
 	rm -f $DIR/$tfile
 }
 run_test 105b "fcntl when mounted without -o flock test ========"
 
 test_105c() {
-        touch $DIR/$tfile
-        if [ -n "`mount | grep \"$DIR.*flock\" | grep -v noflock`" ];
-        then
-                flocks_test 1 on -l $DIR/$tfile || error "fail flock on"
-        else
-                flocks_test 1 off -l $DIR/$tfile || error "fail flock off"
-        fi
+	touch $DIR/$tfile
+	if [ -n "`mount | grep \"$MOUNT.*flock\" | grep -v noflock`" ]; then
+		flocks_test 1 on -l $DIR/$tfile || error "fail flock on"
+	else
+		flocks_test 1 off -l $DIR/$tfile || error "fail flock off"
+	fi
 	rm -f $DIR/$tfile
 }
 run_test 105c "lockf when mounted without -o flock test ========"
 
 test_105d() { # bug 15924
-        mkdir -p $DIR/$tdir
-        [ -z "`mount | grep \"$DIR.*flock\" | grep -v noflock`" ] && \
-                skip "mount w/o flock enabled" && return
-        #define OBD_FAIL_LDLM_CP_CB_WAIT  0x315
-        $LCTL set_param fail_loc=0x80000315
-        flocks_test 2 $DIR/$tdir
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
+	test_mkdir -p $DIR/$tdir
+	[ -z "`mount | grep \"$MOUNT.*flock\" | grep -v noflock`" ] && \
+		skip "mount w/o flock enabled" && return
+	#define OBD_FAIL_LDLM_CP_CB_WAIT  0x315
+	$LCTL set_param fail_loc=0x80000315
+	flocks_test 2 $DIR/$tdir
 }
 run_test 105d "flock race (should not freeze) ========"
 
 test_105e() { # bug 22660 && 22040
-	[ -z "`mount | grep \"$DIR.*flock\" | grep -v noflock`" ] && \
+	[ -z "`mount | grep \"$MOUNT.*flock\" | grep -v noflock`" ] && \
 		skip "mount w/o flock enabled" && return
 	touch $DIR/$tfile
 	flocks_test 3 $DIR/$tfile
@@ -5785,13 +6253,14 @@ test_105e() { # bug 22660 && 22040
 run_test 105e "Two conflicting flocks from same process ======="
 
 test_106() { #bug 10921
-	mkdir -p $DIR/$tdir
+	test_mkdir -p $DIR/$tdir
 	$DIR/$tdir && error "exec $DIR/$tdir succeeded"
 	chmod 777 $DIR/$tdir || error "chmod $DIR/$tdir failed"
 }
 run_test 106 "attempt exec of dir followed by chown of that dir"
 
 test_107() {
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
         CDIR=`pwd`
         cd $DIR
 
@@ -5825,18 +6294,23 @@ test_107() {
 run_test 107 "Coredump on SIG"
 
 test_110() {
-	mkdir -p $DIR/d110
-	mkdir $DIR/d110/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa || error "mkdir with 255 char fail"
-	mkdir $DIR/d110/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb && error "mkdir with 256 char should fail, but not"
-	touch $DIR/d110/xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx || error "create with 255 char fail"
-	touch $DIR/d110/yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy && error ""create with 256 char should fail, but not
-
-	ls -l $DIR/d110
-    rm -fr $DIR/d110
+	test_mkdir -p $DIR/$tdir
+	test_mkdir $DIR/$tdir/$(str_repeat 'a' 255) ||
+		error "mkdir with 255 char failed"
+	test_mkdir $DIR/$tdir/$(str_repeat 'b' 256) &&
+		error "mkdir with 256 char should fail, but did not"
+	touch $DIR/$tdir/$(str_repeat 'x' 255) ||
+		error "create with 255 char failed"
+	touch $DIR/$tdir/$(str_repeat 'y' 256) &&
+		error "create with 256 char should fail, but did not"
+
+	ls -l $DIR/$tdir
+	rm -rf $DIR/$tdir
 }
 run_test 110 "filename length checking"
 
 test_115() {
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	OSTIO_pre=$(ps -e|grep ll_ost_io|awk '{print $4}'|sort -n|tail -1|\
 	    cut -c11-20)
         [ -z "$OSTIO_pre" ] && skip "no OSS threads" && \
@@ -5847,7 +6321,7 @@ test_115() {
 	NUMFREE=`df -i -P $DIR | tail -n 1 | awk '{ print $4 }'`
 	[ $NUMFREE -lt $NUMTEST ] && NUMTEST=$(($NUMFREE - 1000))
 	echo "$NUMTEST creates/unlinks"
-	mkdir -p $DIR/$tdir
+	test_mkdir -p $DIR/$tdir
 	createmany -o $DIR/$tdir/$tfile $NUMTEST
 	unlinkmany $DIR/$tdir/$tfile $NUMTEST
 
@@ -5855,9 +6329,9 @@ test_115() {
 	    cut -c11-20)
 
 	# don't return an error
-        [ $OSTIO_post -eq $OSTIO_pre ] && echo \
-	    "WARNING: No new ll_ost_io threads were created ($OSTIO_pre)" &&\
-	    echo "This may be fine, depending on what ran before this test" &&\
+        [ $OSTIO_post == $OSTIO_pre ] && echo \
+	    "WARNING: No new ll_ost_io threads were created ($OSTIO_pre)" &&
+	    echo "This may be fine, depending on what ran before this test" &&
 	    echo "and how fast this system is." && return
 
         echo "Started with $OSTIO_pre threads, ended with $OSTIO_post"
@@ -5883,7 +6357,8 @@ free_min_max () {
 	echo Max free space: OST $MAXI: $MAXV
 }
 
-test_116() {
+test_116a() { # was previously test_116()
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	[ "$OSTCOUNT" -lt "2" ] && skip_env "$OSTCOUNT < 2 OSTs" && return
 
 	echo -n "Free space priority "
@@ -5894,7 +6369,7 @@ test_116() {
 		return
 
 	# generate uneven OSTs
-	mkdir -p $DIR/$tdir/OST${MINI}
+	test_mkdir -p $DIR/$tdir/OST${MINI}
 	declare -i FILL
 	FILL=$(($MINV / 4))
 	echo "Filling 25% remaining space in OST${MINI} with ${FILL}Kb"
@@ -5966,10 +6441,26 @@ test_116() {
 
 	rm -rf $DIR/$tdir
 }
-run_test 116 "stripe QOS: free space balance ==================="
+run_test 116a "stripe QOS: free space balance ==================="
+
+test_116b() { # LU-2093
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
+#define OBD_FAIL_MDS_OSC_CREATE_FAIL     0x147
+	local old_rr
+	old_rr=$(do_facet $SINGLEMDS lctl get_param -n lov.*mdtlov*.qos_threshold_rr)
+	do_facet $SINGLEMDS lctl set_param lov.*mdtlov*.qos_threshold_rr 0
+	mkdir -p $DIR/$tdir
+	do_facet $SINGLEMDS lctl set_param fail_loc=0x147
+	createmany -o $DIR/$tdir/f- 20 || error "can't create"
+	do_facet $SINGLEMDS lctl set_param fail_loc=0
+	rm -rf $DIR/$tdir
+	do_facet $SINGLEMDS lctl set_param lov.*mdtlov*.qos_threshold_rr $old_rr
+}
+run_test 116b "QoS shouldn't LBUG if not enough OSTs found on the 2nd pass"
 
 test_117() # bug 10891
 {
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
         dd if=/dev/zero of=$DIR/$tfile bs=1M count=1
         #define OBD_FAIL_OST_SETATTR_CREDITS 0x21e
         lctl set_param fail_loc=0x21e
@@ -6003,6 +6494,7 @@ reset_async() {
 
 test_118a() #bug 11710
 {
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	reset_async
 
 	$MULTIOP $DIR/$tfile oO_CREAT:O_RDWR:O_SYNC:w4096c
@@ -6019,6 +6511,7 @@ run_test 118a "verify O_SYNC works =========="
 
 test_118b()
 {
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	remote_ost_nodsh && skip "remote OST with nodsh" && return
 
 	reset_async
@@ -6055,6 +6548,7 @@ run_test 118b "Reclaim dirty pages on fatal error =========="
 
 test_118c()
 {
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	remote_ost_nodsh && skip "remote OST with nodsh" && return
 
 	reset_async
@@ -6099,6 +6593,7 @@ run_test 118c "Fsync blocks on EROFS until dirty pages are flushed =========="
 
 test_118d()
 {
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	remote_ost_nodsh && skip "remote OST with nodsh" && return
 
 	reset_async
@@ -6137,6 +6632,7 @@ test_118d()
 run_test 118d "Fsync validation inject a delay of the bulk =========="
 
 test_118f() {
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
         reset_async
 
         #define OBD_FAIL_OSC_BRW_PREP_REQ2        0x40a
@@ -6172,6 +6668,7 @@ test_118f() {
 run_test 118f "Simulate unrecoverable OSC side error =========="
 
 test_118g() {
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	reset_async
 
 	#define OBD_FAIL_OSC_BRW_PREP_REQ        0x406
@@ -6207,6 +6704,7 @@ test_118g() {
 run_test 118g "Don't stay in wait if we got local -ENOMEM  =========="
 
 test_118h() {
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	remote_ost_nodsh && skip "remote OST with nodsh" && return
 
         reset_async
@@ -6241,7 +6739,10 @@ test_118h() {
 }
 run_test 118h "Verify timeout in handling recoverables errors  =========="
 
+[ "$SLOW" = "no" ] && [ -n "$OLD_RESENDCOUNT" ] && set_resend_count $OLD_RESENDCOUNT
+
 test_118i() {
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	remote_ost_nodsh && skip "remote OST with nodsh" && return
 
         reset_async
@@ -6279,7 +6780,10 @@ test_118i() {
 }
 run_test 118i "Fix error before timeout in recoverable error  =========="
 
+[ "$SLOW" = "no" ] && set_resend_count 4
+
 test_118j() {
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	remote_ost_nodsh && skip "remote OST with nodsh" && return
 
         reset_async
@@ -6316,11 +6820,12 @@ run_test 118j "Simulate unrecoverable OST side error =========="
 
 test_118k()
 {
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	remote_ost_nodsh && skip "remote OSTs with nodsh" && return
 
 	#define OBD_FAIL_OST_BRW_WRITE_BULK      0x20e
 	set_nodes_failloc "$(osts_nodes)" 0x20e
-	mkdir -p $DIR/$tdir
+	test_mkdir -p $DIR/$tdir
 
 	for ((i=0;i<10;i++)); do
 		(dd if=/dev/zero of=$DIR/$tdir/$tfile-$i bs=1M count=10 || \
@@ -6338,8 +6843,9 @@ run_test 118k "bio alloc -ENOMEM and IO TERM handling ========="
 
 test_118l()
 {
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	# LU-646
-	mkdir -p $DIR/$tdir
+	test_mkdir -p $DIR/$tdir
 	$MULTIOP $DIR/$tdir Dy || error "fsync dir failed"
 	rm -rf $DIR/$tdir
 }
@@ -6387,6 +6893,7 @@ run_test 119c "Testing for direct read hitting hole"
 
 test_119d() # bug 15950
 {
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
         MAX_RPCS_IN_FLIGHT=`$LCTL get_param -n osc.*OST0000-osc-[^mM]*.max_rpcs_in_flight`
         $LCTL set_param -n osc.*OST0000-osc-[^mM]*.max_rpcs_in_flight 1
         BSIZE=1048576
@@ -6411,7 +6918,8 @@ test_119d() # bug 15950
 run_test 119d "The DIO path should try to send a new rpc once one is completed"
 
 test_120a() {
-        mkdir -p $DIR/$tdir
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
+        test_mkdir -p $DIR/$tdir
         [ -z "`lctl get_param -n mdc.*.connect_flags | grep early_lock_cancel`" ] && \
                skip "no early lock cancel on server" && return 0
         lru_resize_disable mdc
@@ -6420,7 +6928,7 @@ test_120a() {
         stat $DIR/$tdir > /dev/null
         can1=`lctl get_param -n ldlm.services.ldlm_canceld.stats | awk '/ldlm_cancel/ {print $2}'`
         blk1=`lctl get_param -n ldlm.services.ldlm_cbd.stats | awk '/ldlm_bl_callback/ {print $2}'`
-        mkdir $DIR/$tdir/d1
+        test_mkdir $DIR/$tdir/d1
         can2=`lctl get_param -n ldlm.services.ldlm_canceld.stats | awk '/ldlm_cancel/ {print $2}'`
         blk2=`lctl get_param -n ldlm.services.ldlm_cbd.stats | awk '/ldlm_bl_callback/ {print $2}'`
         [ $can1 -eq $can2 ] || error $((can2-can1)) "cancel RPC occured."
@@ -6431,7 +6939,8 @@ test_120a() {
 run_test 120a "Early Lock Cancel: mkdir test"
 
 test_120b() {
-        mkdir -p $DIR/$tdir
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
+        test_mkdir -p $DIR/$tdir
         [ -z "`lctl get_param -n mdc.*.connect_flags | grep early_lock_cancel`" ] && \
                skip "no early lock cancel on server" && return 0
         lru_resize_disable mdc
@@ -6451,12 +6960,13 @@ test_120b() {
 run_test 120b "Early Lock Cancel: create test"
 
 test_120c() {
-        mkdir -p $DIR/$tdir
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
+        test_mkdir -p $DIR/$tdir
         [ -z "`lctl get_param -n mdc.*.connect_flags | grep early_lock_cancel`" ] && \
                skip "no early lock cancel on server" && return 0
         lru_resize_disable mdc
         lru_resize_disable osc
-        mkdir -p $DIR/$tdir/d1 $DIR/$tdir/d2
+        test_mkdir -p $DIR/$tdir/d1 $DIR/$tdir/d2
         touch $DIR/$tdir/d1/f1
         cancel_lru_locks mdc
         stat $DIR/$tdir/d1 $DIR/$tdir/d2 $DIR/$tdir/d1/f1 > /dev/null
@@ -6473,7 +6983,8 @@ test_120c() {
 run_test 120c "Early Lock Cancel: link test"
 
 test_120d() {
-        mkdir -p $DIR/$tdir
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
+        test_mkdir -p $DIR/$tdir
         [ -z "`lctl get_param -n mdc.*.connect_flags | grep early_lock_cancel`" ] && \
                skip "no early lock cancel on server" && return 0
         lru_resize_disable mdc
@@ -6494,7 +7005,8 @@ test_120d() {
 run_test 120d "Early Lock Cancel: setattr test"
 
 test_120e() {
-        mkdir -p $DIR/$tdir
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
+        test_mkdir -p $DIR/$tdir
         [ -z "`lctl get_param -n mdc.*.connect_flags | grep early_lock_cancel`" ] && \
                skip "no early lock cancel on server" && return 0
         lru_resize_disable mdc
@@ -6521,12 +7033,13 @@ test_120e() {
 run_test 120e "Early Lock Cancel: unlink test"
 
 test_120f() {
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
         [ -z "`lctl get_param -n mdc.*.connect_flags | grep early_lock_cancel`" ] && \
                skip "no early lock cancel on server" && return 0
-        mkdir -p $DIR/$tdir
+        test_mkdir -p $DIR/$tdir
         lru_resize_disable mdc
         lru_resize_disable osc
-        mkdir -p $DIR/$tdir/d1 $DIR/$tdir/d2
+        test_mkdir -p $DIR/$tdir/d1 $DIR/$tdir/d2
         dd if=/dev/zero of=$DIR/$tdir/d1/f1 count=1
         dd if=/dev/zero of=$DIR/$tdir/d2/f2 count=1
         cancel_lru_locks mdc
@@ -6551,13 +7064,14 @@ test_120f() {
 run_test 120f "Early Lock Cancel: rename test"
 
 test_120g() {
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
         [ -z "`lctl get_param -n mdc.*.connect_flags | grep early_lock_cancel`" ] && \
                skip "no early lock cancel on server" && return 0
         lru_resize_disable mdc
         lru_resize_disable osc
         count=10000
         echo create $count files
-        mkdir -p $DIR/$tdir
+        test_mkdir -p $DIR/$tdir
         cancel_lru_locks mdc
         cancel_lru_locks osc
         t0=`date +%s`
@@ -6592,6 +7106,7 @@ test_120g() {
 run_test 120g "Early Lock Cancel: performance test"
 
 test_121() { #bug #10589
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	rm -rf $DIR/$tfile
 	writes=$(LANG=C dd if=/dev/zero of=$DIR/$tfile count=1 2>&1 | awk -F '+' '/out$/ {print $1}')
 #define OBD_FAIL_LDLM_CANCEL_RACE        0x310
@@ -6604,6 +7119,7 @@ test_121() { #bug #10589
 run_test 121 "read cancel race ========="
 
 test_123a() { # was test 123, statahead(bug 11401)
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
         SLOWOK=0
         if [ -z "$(grep "processor.*: 1" /proc/cpuinfo)" ]; then
             log "testing on UP system. Performance may be not as good as expected."
@@ -6611,7 +7127,7 @@ test_123a() { # was test 123, statahead(bug 11401)
         fi
 
         rm -rf $DIR/$tdir
-        mkdir -p $DIR/$tdir
+        test_mkdir -p $DIR/$tdir
         NUMFREE=`df -i -P $DIR | tail -n 1 | awk '{ print $4 }'`
         [ $NUMFREE -gt 100000 ] && NUMFREE=100000 || NUMFREE=$((NUMFREE-1000))
         MULT=10
@@ -6685,7 +7201,8 @@ test_123a() { # was test 123, statahead(bug 11401)
 run_test 123a "verify statahead work"
 
 test_123b () { # statahead(bug 15027)
-	mkdir -p $DIR/$tdir
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
+	test_mkdir -p $DIR/$tdir
 	createmany -o $DIR/$tdir/$tfile-%d 1000
 
         cancel_lru_locks mdc
@@ -6704,10 +7221,11 @@ test_123b () { # statahead(bug 15027)
 run_test 123b "not panic with network error in statahead enqueue (bug 15027)"
 
 test_124a() {
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	[ -z "`lctl get_param -n mdc.*.connect_flags | grep lru_resize`" ] && \
                skip "no lru resize on server" && return 0
         local NR=2000
-        mkdir -p $DIR/$tdir || error "failed to create $DIR/$tdir"
+        test_mkdir -p $DIR/$tdir || error "failed to create $DIR/$tdir"
 
         log "create $NR files at $DIR/$tdir"
         createmany -o $DIR/$tdir/f $NR ||
@@ -6800,6 +7318,7 @@ get_max_pool_limit()
 }
 
 test_124b() {
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	[ -z "`lctl get_param -n mdc.*.connect_flags | grep lru_resize`" ] && \
                skip "no lru resize on server" && return 0
 
@@ -6811,7 +7330,7 @@ test_124b() {
                 NR=$LIMIT
         fi
         lru_resize_disable mdc
-        mkdir -p $DIR/$tdir/disable_lru_resize ||
+        test_mkdir -p $DIR/$tdir/disable_lru_resize ||
 		error "failed to create $DIR/$tdir/disable_lru_resize"
 
         createmany -o $DIR/$tdir/disable_lru_resize/f $NR
@@ -6835,7 +7354,7 @@ test_124b() {
         unlinkmany $DIR/$tdir/disable_lru_resize/f $NR
 
         lru_resize_enable mdc
-        mkdir -p $DIR/$tdir/enable_lru_resize ||
+        test_mkdir -p $DIR/$tdir/enable_lru_resize ||
 		error "failed to create $DIR/$tdir/enable_lru_resize"
 
         createmany -o $DIR/$tdir/enable_lru_resize/f $NR
@@ -6871,7 +7390,7 @@ run_test 124b "lru resize (performance test) ======================="
 test_125() { # 13358
 	[ -z "$(lctl get_param -n llite.*.client_type | grep local)" ] && skip "must run as local client" && return
 	[ -z "$(lctl get_param -n mdc.*-mdc-*.connect_flags | grep acl)" ] && skip "must have acl enabled" && return
-	mkdir -p $DIR/d125 || error "mkdir failed"
+	test_mkdir -p $DIR/d125 || error "mkdir failed"
 	$SETSTRIPE -S 65536 -c -1 $DIR/d125 || error "setstripe failed"
 	setfacl -R -m u:bin:rwx $DIR/d125 || error "setfacl $DIR/d125 failed"
 	ls -ld $DIR/d125 || error "cannot access $DIR/d125"
@@ -6891,6 +7410,7 @@ test_126() { # bug 12829/13455
 run_test 126 "check that the fsgid provided by the client is taken into account"
 
 test_127a() { # bug 15521
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
         $SETSTRIPE -i 0 -c 1 $DIR/$tfile || error "setstripe failed"
         $LCTL set_param osc.*.stats=0
         FSIZE=$((2048 * 1024))
@@ -6929,6 +7449,7 @@ test_127a() { # bug 15521
 run_test 127a "verify the client stats are sane"
 
 test_127b() { # bug LU-333
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
         $LCTL set_param llite.*.stats=0
         FSIZE=65536 # sized fixed to match PAGE_SIZE for most clients
         # perform 2 reads and writes so MAX is different from SUM.
@@ -6987,15 +7508,20 @@ set_dir_limits () {
 	local node
 
 	local LDPROC=/proc/fs/ldiskfs
+	local facets=$(get_facets MDS)
 
-	for facet in $(get_facets MDS); do
-		canondev=$(ldiskfs_canon *.$(convert_facet2label $facet).mntdev $facet)
-		do_facet $facet "test -e $LDPROC/$canondev/max_dir_size" || LDPROC=/sys/fs/ldiskfs
+	for facet in ${facets//,/ }; do
+		canondev=$(ldiskfs_canon \
+			   *.$(convert_facet2label $facet).mntdev $facet)
+		do_facet $facet "test -e $LDPROC/$canondev/max_dir_size" ||
+						LDPROC=/sys/fs/ldiskfs
 		do_facet $facet "echo $1 >$LDPROC/$canondev/max_dir_size"
 	done
 }
+
 test_129() {
-	if [ "$(facet_type_fstype MDS)" != ldiskfs ]; then
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
+	if [ "$(facet_fstype $SINGLEMDS)" != ldiskfs ]; then
 		skip "Only applicable to ldiskfs-based MDTs"
 		return
 	fi
@@ -7005,11 +7531,10 @@ test_129() {
 	MAX=16384
 
 	set_dir_limits $MAX
+	test_mkdir -p $DIR/$tdir
 
-	mkdir -p $DIR/$tdir
-
-	I=0
-	J=0
+	local I=0
+	local J=0
 	while [ ! $I -gt $((MAX * MDSCOUNT)) ]; do
 		$MULTIOP $DIR/$tdir/$J Oc
 		rc=$?
@@ -7037,18 +7562,26 @@ cleanup_130() {
 }
 
 test_130a() {
-	filefrag_op=$(filefrag -e 2>&1 | grep "invalid option")
-	[ -n "$filefrag_op" ] && skip "filefrag does not support FIEMAP" && return
+	local filefrag_op=$(filefrag -e 2>&1 | grep "invalid option")
+	[ -n "$filefrag_op" ] && skip_env "filefrag does not support FIEMAP" &&
+		return
 
 	trap cleanup_130 EXIT RETURN
 
 	local fm_file=$DIR/$tfile
 	$SETSTRIPE -S 65536 -c 1 $fm_file || error "setstripe on $fm_file"
-	dd if=/dev/zero of=$fm_file bs=65536 count=1 || error "dd failed for $fm_file"
+	dd if=/dev/zero of=$fm_file bs=65536 count=1 ||
+		error "dd failed for $fm_file"
 
-	filefrag -ves $fm_file || error "filefrag $fm_file failed"
-	filefrag_op=`filefrag -ve $fm_file | grep -A 100 "ext:" | grep -v "ext:" | grep -v "found"`
+	# LU-1795: test filefrag/FIEMAP once, even if unsupported
+	filefrag -ves $fm_file
+	RC=$?
+	[ "$(facet_fstype ost$(($($GETSTRIPE -i $fm_file) + 1)))" = "zfs" ] &&
+		skip "ORI-366/LU-1941: FIEMAP unimplemented on ZFS" && return
+	[ $RC != 0 ] && error "filefrag $fm_file failed"
 
+	filefrag_op=$(filefrag -ve $fm_file | grep -A 100 "ext:" |
+		      grep -v "ext:" | grep -v "found")
 	lun=$($GETSTRIPE -i $fm_file)
 
 	start_blk=`echo $filefrag_op | cut -d: -f2 | cut -d. -f1`
@@ -7079,21 +7612,28 @@ test_130a() {
 run_test 130a "FIEMAP (1-stripe file)"
 
 test_130b() {
-	[ "$OSTCOUNT" -lt "2" ] && skip_env "skipping FIEMAP on 2-stripe file test" && return
+	[ "$OSTCOUNT" -lt "2" ] &&
+		skip_env "skipping FIEMAP on 2-stripe file test" && return
 
-	filefrag_op=$(filefrag -e 2>&1 | grep "invalid option")
-	[ -n "$filefrag_op" ] && skip "filefrag does not support FIEMAP" && return
+	local filefrag_op=$(filefrag -e 2>&1 | grep "invalid option")
+	[ -n "$filefrag_op" ] && skip_env "filefrag does not support FIEMAP" &&
+		return
 
 	trap cleanup_130 EXIT RETURN
 
 	local fm_file=$DIR/$tfile
 	$SETSTRIPE -S 65536 -c 2 $fm_file || error "setstripe on $fm_file"
-	dd if=/dev/zero of=$fm_file bs=1M count=2 || error "dd failed on $fm_file"
+	[ "$(facet_fstype ost$(($($GETSTRIPE -i $fm_file) + 1)))" = "zfs" ] &&
+		skip "ORI-366/LU-1941: FIEMAP unimplemented on ZFS" && return
+
+	dd if=/dev/zero of=$fm_file bs=1M count=2 ||
+		error "dd failed on $fm_file"
 
 	filefrag -ves $fm_file || error "filefrag $fm_file failed"
-	filefrag_op=`filefrag -ve $fm_file | grep -A 100 "ext:" | grep -v "ext:" | grep -v "found"`
+	filefrag_op=$(filefrag -ve $fm_file | grep -A 100 "ext:" |
+		      grep -v "ext:" | grep -v "found")
 
-	last_lun=`echo $filefrag_op | cut -d: -f5`
+	last_lun=$(echo $filefrag_op | cut -d: -f5)
 
 	IFS=$'\n'
 	tot_len=0
@@ -7128,15 +7668,20 @@ test_130b() {
 run_test 130b "FIEMAP (2-stripe file)"
 
 test_130c() {
-	[ "$OSTCOUNT" -lt "2" ] && skip_env "skipping FIEMAP on 2-stripe file with hole test" && return
+	[ "$OSTCOUNT" -lt "2" ] &&
+		skip_env "skipping FIEMAP on 2-stripe file" && return
 
 	filefrag_op=$(filefrag -e 2>&1 | grep "invalid option")
-	[ -n "$filefrag_op" ] && skip "filefrag does not support FIEMAP" && return
+	[ -n "$filefrag_op" ] && skip "filefrag does not support FIEMAP" &&
+		return
 
 	trap cleanup_130 EXIT RETURN
 
 	local fm_file=$DIR/$tfile
 	$SETSTRIPE -S 65536 -c 2 $fm_file || error "setstripe on $fm_file"
+	[ "$(facet_fstype ost$(($($GETSTRIPE -i $fm_file) + 1)))" = "zfs" ] &&
+		skip "ORI-366/LU-1941: FIEMAP unimplemented on ZFS" && return
+
 	dd if=/dev/zero of=$fm_file seek=1 bs=1M count=1 || error "dd failed on $fm_file"
 
 	filefrag -ves $fm_file || error "filefrag $fm_file failed"
@@ -7192,6 +7737,8 @@ test_130d() {
 
 	local fm_file=$DIR/$tfile
 	$SETSTRIPE -S 65536 -c $OSTCOUNT $fm_file||error "setstripe on $fm_file"
+	[ "$(facet_fstype ost$(($($GETSTRIPE -i $fm_file) + 1)))" = "zfs" ] &&
+		skip "ORI-366/LU-1941: FIEMAP unimplemented on ZFS" && return
 	dd if=/dev/zero of=$fm_file bs=1M count=$OSTCOUNT || error "dd failed on $fm_file"
 
 	filefrag -ves $fm_file || error "filefrag $fm_file failed"
@@ -7241,6 +7788,9 @@ test_130e() {
 
 	local fm_file=$DIR/$tfile
 	$SETSTRIPE -S 131072 -c 2 $fm_file || error "setstripe on $fm_file"
+	[ "$(facet_fstype ost$(($($GETSTRIPE -i $fm_file) + 1)))" = "zfs" ] &&
+		skip "ORI-366/LU-1941: FIEMAP unimplemented on ZFS" && return
+
 	NUM_BLKS=512
 	EXPECTED_LEN=$(( (NUM_BLKS / 2) * 64 ))
 	for ((i = 0; i < $NUM_BLKS; i++))
@@ -7362,6 +7912,7 @@ som_mode_switch() {
 }
 
 test_132() { #1028, SOM
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
         remote_mds_nodsh && skip "remote MDS with nodsh" && return
         local num=$(get_mds_dir $DIR)
         local mymds=mds${num}
@@ -7421,6 +7972,7 @@ check_stats() {
 }
 
 test_133a() {
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	remote_ost_nodsh && skip "remote OST with nodsh" && return
 	remote_mds_nodsh && skip "remote MDS with nodsh" && return
 
@@ -7465,6 +8017,7 @@ test_133a() {
 run_test 133a "Verifying MDT stats ========================================"
 
 test_133b() {
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	remote_ost_nodsh && skip "remote OST with nodsh" && return
 	remote_mds_nodsh && skip "remote MDS with nodsh" && return
 	local testdir=$DIR/${tdir}/stats_testdir
@@ -7480,8 +8033,11 @@ test_133b() {
 	chmod 444 ${testdir}/${tfile} || error "chmod failed"
 	check_stats $SINGLEMDS "setattr" 1
 	do_facet $SINGLEMDS $LCTL set_param mdt.*.md_stats=clear
-	ls -l ${testdir}/${tfile} > /dev/null|| error "ls failed"
-	check_stats $SINGLEMDS "getattr" 1
+	if [ $(lustre_version_code $SINGLEMDS) -ne $(version_code 2.2.0) ]
+	then		# LU-1740
+		ls -l ${testdir}/${tfile} > /dev/null|| error "ls failed"
+		check_stats $SINGLEMDS "getattr" 1
+	fi
 	$LFS df || error "lfs failed"
 	check_stats $SINGLEMDS "statfs" 1
 
@@ -7490,15 +8046,17 @@ test_133b() {
 run_test 133b "Verifying extra MDT stats =================================="
 
 test_133c() {
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	remote_ost_nodsh && skip "remote OST with nodsh" && return
 	remote_mds_nodsh && skip "remote MDS with nodsh" && return
 	local testdir=$DIR/${tdir}/stats_testdir
-	mkdir -p ${testdir} || error "mkdir failed"
+	test_mkdir -p ${testdir} || error "mkdir failed"
 
 	# verify obdfilter stats.
 	$SETSTRIPE -c 1 -i 0 ${testdir}/${tfile}
 	sync
 	cancel_lru_locks osc
+	wait_delete_completed
 
 	# clear stats.
 	do_facet $SINGLEMDS $LCTL set_param mdt.*.md_stats=clear
@@ -7516,6 +8074,7 @@ test_133c() {
 	check_stats ost "punch" 1
 
 	rm -f ${testdir}/${tfile} || error "file remove failed"
+	wait_delete_completed
 	check_stats ost "destroy" 1
 
 	rm -rf $DIR/${tdir}
@@ -7564,12 +8123,15 @@ size_in_KMGT() {
 
 get_rename_size() {
     local size=$1
+    local context=${2:-.}
     local sample=$(do_facet $SINGLEMDS $LCTL get_param mdt.*.rename_stats |
-                   awk '/ '${size}'/ {print $4}' | sed -e "s/,//g")
+		grep -A1 $context |
+		awk '/ '${size}'/ {print $4}' | sed -e "s/,//g")
     echo $sample
 }
 
 test_133d() {
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
     remote_ost_nodsh && skip "remote OST with nodsh" && return
     remote_mds_nodsh && skip "remote MDS with nodsh" && return
     do_facet $SINGLEMDS $LCTL list_param mdt.*.rename_stats ||
@@ -7580,8 +8142,8 @@ test_133d() {
 
     do_facet $SINGLEMDS $LCTL set_param mdt.*.rename_stats=clear
 
-    mkdir -p ${testdir1} || error "mkdir failed"
-    mkdir -p ${testdir2} || error "mkdir failed"
+    test_mkdir -p ${testdir1} || error "mkdir failed"
+    test_mkdir -p ${testdir2} || error "mkdir failed"
 
     createmany -o $testdir1/test 512 || error "createmany failed"
 
@@ -7631,8 +8193,8 @@ test_133d() {
 
     eval $cmd || error "$cmd failed"
     local crossdir=$($cmd | grep 'crossdir')
-    local src_sample=$(get_rename_size $testdir1_size)
-    local tgt_sample=$(get_rename_size $testdir2_size)
+    local src_sample=$(get_rename_size $testdir1_size crossdir_src)
+    local tgt_sample=$(get_rename_size $testdir2_size crossdir_tgt)
     [ -z "$crossdir" ] && error "crossdir_rename_size count error"
     [ "$src_sample" -eq 1 ] || error "crossdir_rename_size error $src_sample"
     [ "$tgt_sample" -eq 1 ] || error "crossdir_rename_size error $tgt_sample"
@@ -7641,15 +8203,63 @@ test_133d() {
 }
 run_test 133d "Verifying rename_stats ========================================"
 
+test_133e() {
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
+	local testdir=$DIR/${tdir}/stats_testdir
+	local ctr f0 f1 bs=32768 count=42 sum
+
+	remote_ost_nodsh && skip "remote OST with nodsh" && return
+	mkdir -p ${testdir} || error "mkdir failed"
+
+	$SETSTRIPE -c 1 -i 0 ${testdir}/${tfile}
+
+	for ctr in {write,read}_bytes; do
+		sync
+		cancel_lru_locks osc
+
+		do_facet ost1 $LCTL set_param -n \
+			"obdfilter.*.exports.clear=clear"
+
+		if [ $ctr = write_bytes ]; then
+			f0=/dev/zero
+			f1=${testdir}/${tfile}
+		else
+			f0=${testdir}/${tfile}
+			f1=/dev/null
+		fi
+
+		dd if=$f0 of=$f1 conv=notrunc bs=$bs count=$count || \
+			error "dd failed"
+		sync
+		cancel_lru_locks osc
+
+		sum=$(do_facet ost1 $LCTL get_param \
+				"obdfilter.*.exports.*.stats" | \
+			  awk -v ctr=$ctr '\
+				BEGIN { sum = 0 }
+				$1 == ctr { sum += $7 }
+				END { print sum }')
+
+		if ((sum != bs * count)); then
+			error "Bad $ctr sum, expected $((bs * count)), got $sum"
+		fi
+	done
+
+	rm -rf $DIR/${tdir}
+}
+run_test 133e "Verifying OST {read,write}_bytes nid stats ================="
+
 test_140() { #bug-17379
-        mkdir -p $DIR/$tdir || error "Creating dir $DIR/$tdir"
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
+        test_mkdir -p $DIR/$tdir || error "Creating dir $DIR/$tdir"
         cd $DIR/$tdir || error "Changing to $DIR/$tdir"
         cp /usr/bin/stat . || error "Copying stat to $DIR/$tdir"
 
-        # VFS limits max symlink depth to 5(4KSTACK) or 7(8KSTACK) or 8
-        local i=0
+	# VFS limits max symlink depth to 5(4KSTACK) or 7(8KSTACK) or 8
+	# For kernel > 3.5, bellow only tests consecutive symlink (MAX 40)
+	local i=0
         while i=`expr $i + 1`; do
-                mkdir -p $i || error "Creating dir $i"
+                test_mkdir -p $i || error "Creating dir $i"
                 cd $i || error "Changing to $i"
                 ln -s ../stat stat || error "Creating stat symlink"
                 # Read the symlink until ELOOP present,
@@ -7667,11 +8277,19 @@ test_140() { #bug-17379
         done
         i=`expr $i - 1`
         echo "The symlink depth = $i"
-        [ $i -eq 5 -o $i -eq 7 -o $i -eq 8 ] || error "Invalid symlink depth"
+	[ $i -eq 5 -o $i -eq 7 -o $i -eq 8 -o $i -eq 40 ] ||
+					error "Invalid symlink depth"
+
+	# Test recursive symlink
+	ln -s symlink_self symlink_self
+	$OPENFILE -f O_RDONLY symlink_self >/dev/null 2>&1; ret=$?
+	echo "open symlink_self returns $ret"
+	[ $ret -eq 40 ] || error "recursive symlink doesn't return -ELOOP"
 }
 run_test 140 "Check reasonable stack depth (shouldn't LBUG) ===="
 
 test_150() {
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	local TF="$TMP/$tfile"
 
         dd if=/dev/urandom of=$TF bs=6096 count=1 || error "dd failed"
@@ -7705,7 +8323,7 @@ run_test 150 "truncate/append tests"
 function roc_hit() {
 	local list=$(comma_list $(osts_nodes))
 
-	echo $(get_obdfilter_param $list '' stats |
+	echo $(get_osd_param $list '' stats |
 	       awk '/'cache_hit'/ {sum+=$2} END {print sum}')
 }
 
@@ -7716,30 +8334,31 @@ function set_cache() {
 		on=0;
 	fi
 	local list=$(comma_list $(osts_nodes))
-	set_obdfilter_param $list '' $1_cache_enable $on
+	set_osd_param $list '' $1_cache_enable $on
 
 	cancel_lru_locks osc
 }
 
 test_151() {
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	remote_ost_nodsh && skip "remote OST with nodsh" && return
 
 	local CPAGES=3
 	local list=$(comma_list $(osts_nodes))
 
 	# check whether obdfilter is cache capable at all
-	if ! get_obdfilter_param $list '' read_cache_enable >/dev/null; then
+	if ! get_osd_param $list '' read_cache_enable >/dev/null; then
 		echo "not cache-capable obdfilter"
 		return 0
 	fi
 
 	# check cache is enabled on all obdfilters
-	if get_obdfilter_param $list '' read_cache_enable | grep 0; then
+	if get_osd_param $list '' read_cache_enable | grep 0; then
 		echo "oss cache is disabled"
 		return 0
 	fi
 
-	set_obdfilter_param $list '' writethrough_cache_enable 1
+	set_osd_param $list '' writethrough_cache_enable 1
 
         # pages should be in the case right after write
         dd if=/dev/urandom of=$DIR/$tfile bs=4k count=$CPAGES || error "dd failed"
@@ -7753,7 +8372,7 @@ test_151() {
 
         # the following read invalidates the cache
         cancel_lru_locks osc
-	set_obdfilter_param $list '' read_cache_enable 0
+	set_osd_param $list '' read_cache_enable 0
         cat $DIR/$tfile >/dev/null
 
         # now data shouldn't be found in the cache
@@ -7765,12 +8384,13 @@ test_151() {
                 error "IN CACHE: before: $BEFORE, after: $AFTER"
         fi
 
-	set_obdfilter_param $list '' read_cache_enable 1
+	set_osd_param $list '' read_cache_enable 1
         rm -f $DIR/$tfile
 }
 run_test 151 "test cache on oss and controls ==============================="
 
 test_152() {
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
         local TF="$TMP/$tfile"
 
         # simulate ENOMEM during write
@@ -7799,6 +8419,10 @@ test_153() {
 run_test 153 "test if fdatasync does not crash ======================="
 
 test_154() {
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
+	[[ $(lustre_version_code $SINGLEMDS) -ge $(version_code 2.2.51) ]] ||
+		{ skip "Need MDS version at least 2.2.51"; return 0; }
+
 	cp /etc/hosts $DIR/$tfile
 
 	fid=$($LFS path2fid $DIR/$tfile)
@@ -7847,7 +8471,7 @@ test_154() {
 	echo "link new fid $fid"
 	ln $DIR/$tfile $ffid && error "link $ffid should fail."
 
-	mkdir -p $DIR/$tdir
+	test_mkdir -p $DIR/$tdir
 	touch $DIR/$tdir/$tfile
 	fid=$($LFS path2fid $DIR/$tdir)
 	rc=$?
@@ -7864,6 +8488,46 @@ test_154() {
 	touch $DIR/.lustre/fid/$tfile && \
 		error "touch $DIR/.lustre/fid/$tfile should fail."
 
+	echo "setxattr to $DIR/.lustre/fid"
+	setfattr -n trusted.name1 -v value1 $DIR/.lustre/fid &&
+		error "setxattr should fail."
+
+	echo "listxattr for $DIR/.lustre/fid"
+	getfattr -d -m "^trusted" $DIR/.lustre/fid &&
+		error "listxattr should fail."
+
+	echo "delxattr from $DIR/.lustre/fid"
+	setfattr -x trusted.name1 $DIR/.lustre/fid &&
+		error "delxattr should fail."
+
+	echo "touch invalid fid: $DIR/.lustre/fid/[0x200000400:0x2:0x3]"
+	touch $DIR/.lustre/fid/[0x200000400:0x2:0x3] &&
+		error "touch invalid fid should fail."
+
+	echo "touch non-normal fid: $DIR/.lustre/fid/[0x1:0x2:0x0]"
+	touch $DIR/.lustre/fid/[0x1:0x2:0x0] &&
+		error "touch non-normal fid should fail."
+
+	echo "rename $tdir to $DIR/.lustre/fid"
+	mrename $DIR/$tdir $DIR/.lustre/fid &&
+		error "rename to $DIR/.lustre/fid should fail."
+
+	echo "rename .lustre to itself"
+	fid=$($LFS path2fid $DIR)
+	mrename $DIR/.lustre $DIR/.lustre/fid/$fid/.lustre &&
+		error "rename .lustre to itself should fail."
+
+	$OPENFILE -f O_LOV_DELAY_CREATE:O_CREAT $DIR/$tfile-2
+	fid=$($LFS path2fid $DIR/$tfile-2)
+	echo "cp /etc/passwd $DIR/.lustre/fid/$fid"
+	cp /etc/passwd $DIR/.lustre/fid/$fid &&
+		error "create lov data thru .lustre should fail."
+	echo "cp /etc/passwd $DIR/$tfile-2"
+	cp /etc/passwd $DIR/$tfile-2 || error "copy to $DIR/$tfile-2 failed."
+	echo "diff /etc/passwd $DIR/.lustre/fid/$fid"
+	diff /etc/passwd $DIR/.lustre/fid/$fid ||
+		error "diff /etc/passwd $DIR/.lustre/fid/$fid failed."
+
 	echo "Open-by-FID succeeded"
 }
 run_test 154 "Open-by-FID"
@@ -7925,66 +8589,79 @@ test_155_big_load() {
 }
 
 test_155a() {
-    set_cache read on
-    set_cache writethrough on
-    test_155_small_load
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
+	set_cache read on
+	set_cache writethrough on
+	test_155_small_load
 }
 run_test 155a "Verify small file correctness: read cache:on write_cache:on"
 
 test_155b() {
-    set_cache read on
-    set_cache writethrough off
-    test_155_small_load
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
+	set_cache read on
+	set_cache writethrough off
+	test_155_small_load
 }
 run_test 155b "Verify small file correctness: read cache:on write_cache:off"
 
 test_155c() {
-    set_cache read off
-    set_cache writethrough on
-    test_155_small_load
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
+	set_cache read off
+	set_cache writethrough on
+	test_155_small_load
 }
 run_test 155c "Verify small file correctness: read cache:off write_cache:on"
 
 test_155d() {
-    set_cache read off
-    set_cache writethrough off
-    test_155_small_load
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
+	set_cache read off
+	set_cache writethrough off
+	test_155_small_load
 }
 run_test 155d "Verify small file correctness: read cache:off write_cache:off"
 
 test_155e() {
-    set_cache read on
-    set_cache writethrough on
-    test_155_big_load
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
+	set_cache read on
+	set_cache writethrough on
+	test_155_big_load
 }
 run_test 155e "Verify big file correctness: read cache:on write_cache:on"
 
 test_155f() {
-    set_cache read on
-    set_cache writethrough off
-    test_155_big_load
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
+	set_cache read on
+	set_cache writethrough off
+	test_155_big_load
 }
 run_test 155f "Verify big file correctness: read cache:on write_cache:off"
 
 test_155g() {
-    set_cache read off
-    set_cache writethrough on
-    test_155_big_load
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
+	set_cache read off
+	set_cache writethrough on
+	test_155_big_load
 }
 run_test 155g "Verify big file correctness: read cache:off write_cache:on"
 
 test_155h() {
-    set_cache read off
-    set_cache writethrough off
-    test_155_big_load
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
+	set_cache read off
+	set_cache writethrough off
+	test_155_big_load
 }
 run_test 155h "Verify big file correctness: read cache:off write_cache:off"
 
 test_156() {
-    local CPAGES=3
-    local BEFORE
-    local AFTER
-    local file="$DIR/$tfile"
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
+	local CPAGES=3
+	local BEFORE
+	local AFTER
+	local file="$DIR/$tfile"
+
+	[ "$(facet_fstype ost1)" = "zfs" ] &&
+		skip "LU-1956/LU-2261: stats unimplemented on OSD ZFS" &&
+		return
 
     log "Turn on read and write cache"
     set_cache read on
@@ -8140,6 +8817,7 @@ changelog_chmask()
 }
 
 test_160() {
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
     remote_mds_nodsh && skip "remote MDS with nodsh" && return
     [ $(lustre_version_code $SINGLEMDS) -ge $(version_code 2.2.0) ] ||
         { skip "Need MDS version at least 2.2.0"; return; }
@@ -8149,7 +8827,7 @@ test_160() {
 	grep -q $USER || error "User $USER not found in changelog_users"
 
     # change something
-    mkdir -p $DIR/$tdir/pics/2008/zachy
+    test_mkdir -p $DIR/$tdir/pics/2008/zachy
     touch $DIR/$tdir/pics/2008/zachy/timestamp
     cp /etc/hosts $DIR/$tdir/pics/2008/zachy/pic1.jpg
     mv $DIR/$tdir/pics/2008/zachy $DIR/$tdir/pics/zach
@@ -8163,13 +8841,13 @@ test_160() {
     changelog_chmask "MKDIR"
     changelog_chmask "CLOSE"
 
-    mkdir -p $DIR/$tdir/pics/zach/sofia
+    test_mkdir -p $DIR/$tdir/pics/zach/sofia
     echo "zzzzzz" > $DIR/$tdir/pics/zach/file
 
     changelog_chmask "MKDIR"
     changelog_chmask "CLOSE"
 
-    mkdir -p $DIR/$tdir/pics/2008/sofia
+    test_mkdir -p $DIR/$tdir/pics/2008/sofia
     echo "zzzzzz" > $DIR/$tdir/pics/zach/file
 
     $LFS changelog $MDT0
@@ -8230,10 +8908,11 @@ test_160() {
 run_test 160 "changelog sanity"
 
 test_161() {
-    mkdir -p $DIR/$tdir
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
+    test_mkdir -p $DIR/$tdir
     cp /etc/hosts $DIR/$tdir/$tfile
-    mkdir $DIR/$tdir/foo1
-    mkdir $DIR/$tdir/foo2
+    test_mkdir $DIR/$tdir/foo1
+    test_mkdir $DIR/$tdir/foo2
     ln $DIR/$tdir/$tfile $DIR/$tdir/foo1/sofia
     ln $DIR/$tdir/$tfile $DIR/$tdir/foo2/zachary
     ln $DIR/$tdir/$tfile $DIR/$tdir/foo1/luna
@@ -8290,12 +8969,13 @@ check_path() {
 
 test_162() {
 	# Make changes to filesystem
-	mkdir -p $DIR/$tdir/d2
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
+	test_mkdir -p $DIR/$tdir/d2
 	touch $DIR/$tdir/d2/$tfile
 	touch $DIR/$tdir/d2/x1
 	touch $DIR/$tdir/d2/x2
-	mkdir -p $DIR/$tdir/d2/a/b/c
-	mkdir -p $DIR/$tdir/d2/p/q/r
+	test_mkdir -p $DIR/$tdir/d2/a/b/c
+	test_mkdir -p $DIR/$tdir/d2/p/q/r
 	# regular file
 	FID=$($LFS path2fid $DIR/$tdir/d2/$tfile | tr -d '[]')
 	check_path "$tdir/d2/$tfile" $FSNAME $FID --link 0
@@ -8332,6 +9012,7 @@ test_162() {
 run_test 162 "path lookup sanity"
 
 test_163() {
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	remote_mds_nodsh && skip "remote MDS with nodsh" && return
 	copytool --test $FSNAME || { skip "copytool not runnable: $?" && return; }
 	copytool $FSNAME &
@@ -8362,6 +9043,7 @@ test_169() {
 run_test 169 "parallel read and truncate should not deadlock"
 
 test_170() {
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
         $LCTL clear	# bug 18514
         $LCTL debug_daemon start $TMP/${tfile}_log_good
         touch $DIR/$tfile
@@ -8415,6 +9097,7 @@ test_170() {
 run_test 170 "test lctl df to handle corrupted log ====================="
 
 test_171() { # bug20592
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 #define OBD_FAIL_PTLRPC_DUMP_LOG         0x50e
         $LCTL set_param fail_loc=0x50e
         $LCTL set_param fail_val=3000
@@ -8479,6 +9162,7 @@ obdecho_create_test() {
 }
 
 test_180a() {
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
         remote_ost_nodsh && skip "remote OST with nodsh" && return
         local rc=0
         local rmmod_local=0
@@ -8504,6 +9188,7 @@ test_180a() {
 run_test 180a "test obdecho on osc"
 
 test_180b() {
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
         remote_ost_nodsh && skip "remote OST with nodsh" && return
         local rc=0
         local rmmod_remote=0
@@ -8519,7 +9204,7 @@ test_180b() {
 run_test 180b "test obdecho directly on obdfilter"
 
 test_181() { # bug 22177
-	mkdir -p $DIR/$tdir || error "creating dir $DIR/$tdir"
+	test_mkdir -p $DIR/$tdir || error "creating dir $DIR/$tdir"
 	# create enough files to index the directory
 	createmany -o $DIR/$tdir/foobar 4000
 	# print attributes for debug purpose
@@ -8538,6 +9223,7 @@ test_181() { # bug 22177
 run_test 181 "Test open-unlinked dir ========================"
 
 test_182() {
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	# disable MDC RPC lock wouldn't crash client
 	local fcount=1000
 	local tcount=4
@@ -8563,6 +9249,167 @@ test_182() {
 }
 run_test 182 "Disable MDC RPCs semaphore wouldn't crash client ================"
 
+test_183() { # LU-2275
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
+	mkdir -p $DIR/$tdir || error "creating dir $DIR/$tdir"
+	echo aaa > $DIR/$tdir/$tfile
+
+#define OBD_FAIL_MDS_NEGATIVE_POSITIVE  0x148
+	do_facet $SINGLEMDS $LCTL set_param fail_loc=0x148
+
+	ls -l $DIR/$tdir && error "ls succeeded, should have failed"
+	cat $DIR/$tdir/$tfile && error "cat succeeded, should have failed"
+
+	do_facet $SINGLEMDS $LCTL set_param fail_loc=0
+
+	# Flush negative dentry cache
+	touch $DIR/$tdir/$tfile
+
+	# We are not checking for any leaked references here, they'll
+	# become evident next time we do cleanup with module unload.
+	rm -rf $DIR/$tdir
+}
+run_test 183 "No crash or request leak in case of strange dispositions ========"
+
+test_185() { # LU-2441
+	mkdir -p $DIR/$tdir || error "creating dir $DIR/$tdir"
+	touch $DIR/$tdir/spoo
+	local mtime1=$(stat -c "%Y" $DIR/$tdir)
+	local fid=$($MULTIOP $DIR/$tdir VFw4096c) ||
+		error "cannot create/write a volatile file"
+	$CHECKSTAT -t file $MOUNT/.lustre/fid/$fid 2>/dev/null &&
+		error "FID is still valid after close"
+
+	multiop_bg_pause $DIR/$tdir vVw4096_c
+	local multi_pid=$!
+
+	local OLD_IFS=$IFS
+	IFS=":"
+	local fidv=($fid)
+	IFS=$OLD_IFS
+	# assume that the next FID for this client is sequential, since stdout
+	# is unfortunately eaten by multiop_bg_pause
+	local n=$((${fidv[1]} + 1))
+	local next_fid="${fidv[0]}:$(printf "0x%x" $n):${fidv[2]}"
+	$CHECKSTAT -t file $MOUNT/.lustre/fid/$next_fid ||
+		error "FID is missing before close"
+	kill -USR1 $multi_pid
+	# 1 second delay, so if mtime change we will see it
+	sleep 1
+	local mtime2=$(stat -c "%Y" $DIR/$tdir)
+	[[ $mtime1 == $mtime2 ]] || error "mtime has changed"
+}
+run_test 185 "Volatile file support"
+
+check_swap_layouts_support()
+{
+	$LCTL get_param -n llite.*.sbi_flags | grep -q layout ||
+		{ skip "Does not support layout lock."; return 0; }
+	return 1
+}
+
+# test suite 184 is for LU-2016, LU-2017
+test_184a() {
+	check_swap_layouts_support && return 0
+
+	dir0=$DIR/$tdir/$testnum
+	test_mkdir -p $dir0 || error "creating dir $dir0"
+	ref1=/etc/passwd
+	ref2=/etc/group
+	file1=$dir0/f1
+	file2=$dir0/f2
+	$SETSTRIPE -c1 $file1
+	cp $ref1 $file1
+	$SETSTRIPE -c2 $file2
+	cp $ref2 $file2
+	gen1=$($GETSTRIPE -g $file1)
+	gen2=$($GETSTRIPE -g $file2)
+
+	$LFS swap_layouts $file1 $file2 || error "swap of file layout failed"
+	gen=$($GETSTRIPE -g $file1)
+	[[ $gen1 != $gen ]] ||
+		"Layout generation on $file1 does not change"
+	gen=$($GETSTRIPE -g $file2)
+	[[ $gen2 != $gen ]] ||
+		"Layout generation on $file2 does not change"
+
+	cmp $ref1 $file2 || error "content compare failed ($ref1 != $file2)"
+	cmp $ref2 $file1 || error "content compare failed ($ref2 != $file1)"
+}
+run_test 184a "Basic layout swap"
+
+test_184b() {
+	check_swap_layouts_support && return 0
+
+	dir0=$DIR/$tdir/$testnum
+	mkdir -p $dir0 || error "creating dir $dir0"
+	file1=$dir0/f1
+	file2=$dir0/f2
+	file3=$dir0/f3
+	dir1=$dir0/d1
+	dir2=$dir0/d2
+	mkdir $dir1 $dir2
+	$SETSTRIPE -c1 $file1
+	$SETSTRIPE -c2 $file2
+	$SETSTRIPE -c1 $file3
+	chown $RUNAS_ID $file3
+	gen1=$($GETSTRIPE -g $file1)
+	gen2=$($GETSTRIPE -g $file2)
+
+	$LFS swap_layouts $dir1 $dir2 &&
+		error "swap of directories layouts should fail"
+	$LFS swap_layouts $dir1 $file1 &&
+		error "swap of directory and file layouts should fail"
+	$RUNAS $LFS swap_layouts $file1 $file2 &&
+		error "swap of file we cannot write should fail"
+	$LFS swap_layouts $file1 $file3 &&
+		error "swap of file with different owner should fail"
+	/bin/true # to clear error code
+}
+run_test 184b "Forbidden layout swap (will generate errors)"
+
+test_184c() {
+	check_swap_layouts_support && return 0
+
+	dir0=$DIR/$tdir/$testnum
+	mkdir -p $dir0 || error "creating dir $dir0"
+	ref1=$dir0/ref1
+	ref2=$dir0/ref2
+	file1=$dir0/file1
+	file2=$dir0/file2
+	# create a file large enough for the concurent test
+	dd if=/dev/urandom of=$ref1 bs=1M count=$((RANDOM % 50 + 20))
+	dd if=/dev/urandom of=$ref2 bs=1M count=$((RANDOM % 50 + 20))
+	echo "ref file size: ref1(`stat -c %s $ref1`), ref2(`stat -c %s $ref2`)"
+
+	cp $ref2 $file2
+	dd if=$ref1 of=$file1 bs=64k &
+	sleep 0.$((RANDOM % 5 + 1))
+
+	$LFS swap_layouts $file1 $file2
+	rc=$?
+	wait $DD_PID
+	[[ $? == 0 ]] || error "concurrent write on $file1 failed"
+	[[ $rc == 0 ]] || error "swap of $file1 and $file2 failed"
+
+	# how many bytes copied before swapping layout
+	local copied=`stat -c %s $file2`
+	local remaining=`stat -c %s $ref1`
+	remaining=$((remaining - copied))
+	echo "Copied $copied bytes before swapping layout..."
+
+	cmp -n $copied $file1 $ref2 ||
+		error "Content mismatch [0, $copied) of ref2 and file1"
+	cmp -n $copied $file2 $ref1 ||
+		error "Content mismatch [0, $copied) of ref1 and file2"
+	cmp -i $copied:$copied -n $remaining $file1 $ref1 ||
+		error "Content mismatch [$copied, EOF) of ref1 and file1"
+
+	# clean up
+	rm -f $ref1 $ref2 $file1 $file2
+}
+run_test 184c "Concurrent write and layout swap"
+
 # OST pools tests
 check_file_in_pool()
 {
@@ -8809,6 +9656,7 @@ pool_remove() {
 }
 
 test_200() {
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	remote_mgs_nodsh && skip "remote MGS with nodsh" && return
 
 	local POOL=${POOL:-cea1}
@@ -8882,7 +9730,7 @@ check_default_stripe_attr() {
 }
 
 test_204a() {
-	mkdir -p $DIR/$tdir
+	test_mkdir -p $DIR/$tdir
 	$SETSTRIPE --stripe-count 0 --stripe-size 0 --stripe-index -1 $DIR/$tdir
 
 	check_default_stripe_attr --stripe-count
@@ -8894,7 +9742,7 @@ test_204a() {
 run_test 204a "Print default stripe attributes ================="
 
 test_204b() {
-	mkdir -p $DIR/$tdir
+	test_mkdir -p $DIR/$tdir
 	$SETSTRIPE --stripe-count 1 $DIR/$tdir
 
 	check_default_stripe_attr --stripe-size
@@ -8905,7 +9753,7 @@ test_204b() {
 run_test 204b "Print default stripe size and offset  ==========="
 
 test_204c() {
-	mkdir -p $DIR/$tdir
+	test_mkdir -p $DIR/$tdir
 	$SETSTRIPE --stripe-size 65536 $DIR/$tdir
 
 	check_default_stripe_attr --stripe-count
@@ -8916,7 +9764,7 @@ test_204c() {
 run_test 204c "Print default stripe count and offset ==========="
 
 test_204d() {
-	mkdir -p $DIR/$tdir
+	test_mkdir -p $DIR/$tdir
 	$SETSTRIPE --stripe-index 0 $DIR/$tdir
 
 	check_default_stripe_attr --stripe-count
@@ -8927,7 +9775,7 @@ test_204d() {
 run_test 204d "Print default stripe count and size ============="
 
 test_204e() {
-	mkdir -p $DIR/$tdir
+	test_mkdir -p $DIR/$tdir
 	$SETSTRIPE -d $DIR/$tdir
 
 	check_default_stripe_attr --stripe-count --raw
@@ -8939,7 +9787,7 @@ test_204e() {
 run_test 204e "Print raw stripe attributes ================="
 
 test_204f() {
-	mkdir -p $DIR/$tdir
+	test_mkdir -p $DIR/$tdir
 	$SETSTRIPE --stripe-count 1 $DIR/$tdir
 
 	check_default_stripe_attr --stripe-size --raw
@@ -8950,7 +9798,7 @@ test_204f() {
 run_test 204f "Print raw stripe size and offset  ==========="
 
 test_204g() {
-	mkdir -p $DIR/$tdir
+	test_mkdir -p $DIR/$tdir
 	$SETSTRIPE --stripe-size 65536 $DIR/$tdir
 
 	check_default_stripe_attr --stripe-count --raw
@@ -8961,7 +9809,7 @@ test_204g() {
 run_test 204g "Print raw stripe count and offset ==========="
 
 test_204h() {
-	mkdir -p $DIR/$tdir
+	test_mkdir -p $DIR/$tdir
 	$SETSTRIPE --stripe-index 0 $DIR/$tdir
 
 	check_default_stripe_attr --stripe-count --raw
@@ -8993,7 +9841,7 @@ verify_jobstats() {
 
 	# clear old jobstats
 	do_facet $SINGLEMDS lctl set_param mdt.*.job_stats="clear"
-	do_facet ost0 lctl set_param obdfilter.*.job_stats="clear"
+	do_facet ost1 lctl set_param obdfilter.*.job_stats="clear"
 
 	# use a new JobID for this test, or we might see an old one
 	[ "$JOBENV" = "FAKE_JOBID" ] && FAKE_JOBID=test_id.$testnum.$RANDOM
@@ -9014,13 +9862,17 @@ verify_jobstats() {
 			grep $JOBVAL || error "No job stats found on MDT $FACET"
 	fi
 	if [ "$target" = "ost" -o "$target" = "both" ]; then
-		FACET=ost0
+		FACET=ost1
 		do_facet $FACET lctl get_param obdfilter.*.job_stats |
 			grep $JOBVAL || error "No job stats found on OST $FACET"
 	fi
 }
 
 test_205() { # Job stats
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
+	[ -z "$(lctl get_param -n mdc.*.connect_flags | grep jobstats)" ] &&
+		skip "Server doesn't support jobstats" && return 0
+
 	local cmd
 	OLD_JOBENV=`$LCTL get_param -n jobid_var`
 	if [ $OLD_JOBENV != $JOBENV ]; then
@@ -9082,6 +9934,41 @@ test_206() {
 }
 run_test 206 "fail lov_init_raid0() doesn't lbug"
 
+test_207a() {
+	dd if=/dev/zero of=$DIR/$tfile bs=4k count=$((RANDOM%10+1))
+	local fsz=`stat -c %s $DIR/$tfile`
+	cancel_lru_locks mdc
+
+	# do not return layout in getattr intent
+#define OBD_FAIL_MDS_NO_LL_GETATTR 0x170
+	$LCTL set_param fail_loc=0x170
+	local sz=`stat -c %s $DIR/$tfile`
+
+	[ $fsz -eq $sz ] || error "file size expected $fsz, actual $sz"
+
+	rm -rf $DIR/$tfile
+}
+run_test 207a "can refresh layout at glimpse"
+
+test_207b() {
+	dd if=/dev/zero of=$DIR/$tfile bs=4k count=$((RANDOM%10+1))
+	local cksum=`md5sum $DIR/$tfile`
+	local fsz=`stat -c %s $DIR/$tfile`
+	cancel_lru_locks mdc
+	cancel_lru_locks osc
+
+	# do not return layout in getattr intent
+#define OBD_FAIL_MDS_NO_LL_OPEN 0x171
+	$LCTL set_param fail_loc=0x171
+
+	# it will refresh layout after the file is opened but before read issues
+	echo checksum is "$cksum"
+	echo "$cksum" |md5sum -c --quiet || error "file differs"
+
+	rm -rf $DIR/$tfile
+}
+run_test 207b "can refresh layout at open"
+
 test_212() {
 	size=`date +%s`
 	size=$((size % 8192 + 1))
@@ -9103,7 +9990,7 @@ test_213() {
 run_test 213 "OSC lock completion and cancel race don't crash - bug 18829"
 
 test_214() { # for bug 20133
-	mkdir -p $DIR/d214p/d214c
+	test_mkdir -p $DIR/d214p/d214c
 	for (( i=0; i < 340; i++ )) ; do
 		touch $DIR/d214p/d214c/a$i
 	done
@@ -9161,6 +10048,7 @@ check_lnet_proc_entry() {
 }
 
 test_215() { # for bugs 18102, 21079, 21517
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	local N='(0|[1-9][0-9]*)'       # non-negative numeric
 	local P='[1-9][0-9]*'           # positive numeric
 	local I='(0|-?[1-9][0-9]*|NA)'  # any numeric (0 | >0 | <0) or NA if no value
@@ -9245,6 +10133,7 @@ test_215() { # for bugs 18102, 21079, 21517
 run_test 215 "/proc/sys/lnet exists and has proper content - bugs 18102, 21079, 21517"
 
 test_216() { # bug 20317
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
         remote_ost_nodsh && skip "remote OST with nodsh" && return
         local node
         local p="$TMP/sanityN-$TESTNAME.parameters"
@@ -9282,6 +10171,7 @@ test_216() { # bug 20317
 run_test 216 "check lockless direct write works and updates file size and kms correctly"
 
 test_217() { # bug 22430
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	local node
 	local nid
 
@@ -9315,6 +10205,7 @@ test_218() {
 run_test 218 "parallel read and truncate should not deadlock ======================="
 
 test_219() {
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
         # write one partial page
         dd if=/dev/zero of=$DIR/$tfile bs=1024 count=1
         # set no grant so vvp_io_commit_write will do sync write
@@ -9330,10 +10221,11 @@ test_219() {
 run_test 219 "LU-394: Write partial won't cause uncontiguous pages vec at LND"
 
 test_220() { #LU-325
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	remote_ost_nodsh && skip "remote OST with nodsh" && return
 	local OSTIDX=0
 
-	mkdir -p $DIR/$tdir
+	test_mkdir -p $DIR/$tdir
 	local OST=$(lfs osts | grep ${OSTIDX}": " | \
 		awk '{print $2}' | sed -e 's/_UUID$//')
 
@@ -9384,6 +10276,7 @@ test_220() { #LU-325
 run_test 220 "preallocated MDS objects still used if ENOSPC from OST"
 
 test_221() {
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
         dd if=`which date` of=$MOUNT/date oflag=sync
         chmod +x $MOUNT/date
 
@@ -9396,8 +10289,9 @@ test_221() {
 run_test 221 "make sure fault and truncate race to not cause OOM"
 
 test_222a () {
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
        rm -rf $DIR/$tdir
-       mkdir -p $DIR/$tdir
+       test_mkdir -p $DIR/$tdir
        $SETSTRIPE -c 1 -i 0 $DIR/$tdir
        createmany -o $DIR/$tdir/$tfile 10
        cancel_lru_locks mdc
@@ -9411,8 +10305,9 @@ test_222a () {
 run_test 222a "AGL for ls should not trigger CLIO lock failure ================"
 
 test_222b () {
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
        rm -rf $DIR/$tdir
-       mkdir -p $DIR/$tdir
+       test_mkdir -p $DIR/$tdir
        $SETSTRIPE -c 1 -i 0 $DIR/$tdir
        createmany -o $DIR/$tdir/$tfile 10
        cancel_lru_locks mdc
@@ -9425,8 +10320,9 @@ test_222b () {
 run_test 222b "AGL for rmdir should not trigger CLIO lock failure ============="
 
 test_223 () {
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
        rm -rf $DIR/$tdir
-       mkdir -p $DIR/$tdir
+       test_mkdir -p $DIR/$tdir
        $SETSTRIPE -c 1 -i 0 $DIR/$tdir
        createmany -o $DIR/$tdir/$tfile 10
        cancel_lru_locks mdc
@@ -9440,6 +10336,7 @@ test_223 () {
 run_test 223 "osc reenqueue if without AGL lock granted ======================="
 
 test_224a() { # LU-1039, MRP-303
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
         #define OBD_FAIL_PTLRPC_CLIENT_BULK_CB   0x508
         $LCTL set_param fail_loc=0x508
         dd if=/dev/zero of=$DIR/$tfile bs=4096 count=1 conv=fsync
@@ -9449,6 +10346,7 @@ test_224a() { # LU-1039, MRP-303
 run_test 224a "Don't panic on bulk IO failure"
 
 test_224b() { # LU-1039, MRP-303
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
         dd if=/dev/zero of=$DIR/$tfile bs=4096 count=1
         cancel_lru_locks osc
         #define OBD_FAIL_PTLRPC_CLIENT_BULK_CB2   0x515
@@ -9461,6 +10359,7 @@ run_test 224b "Don't panic on bulk IO failure"
 
 MDSSURVEY=${MDSSURVEY:-$(which mds-survey 2>/dev/null || true)}
 test_225a () {
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
        if [ -z ${MDSSURVEY} ]; then
               skip_env "mds-survey not found" && return
        fi
@@ -9485,6 +10384,7 @@ test_225a () {
 run_test 225a "Metadata survey sanity with zero-stripe"
 
 test_225b () {
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
        if [ -z ${MDSSURVEY} ]; then
               skip_env "mds-survey not found" && return
        fi
@@ -9523,19 +10423,21 @@ mcreate_path2fid () {
 	local rc
 	local fid_path
 
-	$MCREATE --mode=$1 --major=$2 --minor=$3 $path || \
-		error "error: cannot create $desc"
+	$MCREATE --mode=$1 --major=$2 --minor=$3 $path ||
+		error "cannot create $desc"
 
-	fid=$($LFS path2fid $path)
+	fid=$($LFS path2fid $path | tr -d '[' | tr -d ']')
 	rc=$?
-	[ $rc -ne 0 ] && error "error: cannot get fid of a $desc"
+	[ $rc -ne 0 ] && error "cannot get fid of a $desc"
 
-	fid_path=$($LFS fid2path $DIR $fid)
+	fid_path=$($LFS fid2path $MOUNT $fid)
 	rc=$?
-	[ $rc -ne 0 ] && error "error: cannot get path of a $desc by fid"
+	[ $rc -ne 0 ] && error "cannot get path of $desc by $DIR $path $fid"
 
-	[ "$path" == "$fid_path" ] || \
-		error "error: fid2path returned \`$fid_path', expected \`$path'"
+	[ "$path" == "$fid_path" ] ||
+		error "fid2path returned $fid_path, expected $path"
+
+	echo "pass with $path and $fid"
 }
 
 test_226 () {
@@ -9556,6 +10458,7 @@ run_test 226 "call path2fid and fid2path on files of all type"
 # LU-1299 Executing or running ldd on a truncated executable does not
 # cause an out-of-memory condition.
 test_227() {
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	dd if=`which date` of=$MOUNT/date bs=1k count=1
 	chmod +x $MOUNT/date
 
@@ -9566,8 +10469,51 @@ test_227() {
 run_test 227 "running truncated executable does not cause OOM"
 
 # LU-1512 try to reuse idle OI blocks
-test_228() {
-	[ "$FSTYPE" != "ldiskfs" ] && skip "non-ldiskfs backend" && return
+test_228a() {
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
+	[ "$(facet_fstype $SINGLEMDS)" != "ldiskfs" ] &&
+		skip "non-ldiskfs backend" && return
+
+	local MDT_DEV=$(mdsdevname ${SINGLEMDS//mds/})
+	local myDIR=$DIR/$tdir
+
+	mkdir -p $myDIR
+	#define OBD_FAIL_SEQ_EXHAUST             0x1002
+	$LCTL set_param fail_loc=0x80001002
+	createmany -o $myDIR/t- 10000
+	$LCTL set_param fail_loc=0
+	# The guard is current the largest FID holder
+	touch $myDIR/guard
+	local SEQ=$($LFS path2fid $myDIR/guard | awk -F ':' '{print $1}' |
+		    tr -d '[')
+	local IDX=$(($SEQ % 64))
+
+	do_facet $SINGLEMDS sync
+	# Make sure journal flushed.
+	sleep 6
+	local blk1=$(do_facet $SINGLEMDS \
+		     "$DEBUGFS -c -R \\\"stat oi.16.${IDX}\\\" $MDT_DEV" |
+		     grep Blockcount | awk '{print $4}')
+
+	# Remove old files, some OI blocks will become idle.
+	unlinkmany $myDIR/t- 10000
+	# Create new files, idle OI blocks should be reused.
+	createmany -o $myDIR/t- 2000
+	do_facet $SINGLEMDS sync
+	# Make sure journal flushed.
+	sleep 6
+	local blk2=$(do_facet $SINGLEMDS \
+		     "$DEBUGFS -c -R \\\"stat oi.16.${IDX}\\\" $MDT_DEV" |
+		     grep Blockcount | awk '{print $4}')
+
+	[ $blk1 == $blk2 ] || error "old blk1=$blk1, new blk2=$blk2, unmatched!"
+}
+run_test 228a "try to reuse idle OI blocks"
+
+test_228b() {
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
+	[ "$(facet_fstype $SINGLEMDS)" != "ldiskfs" ] &&
+		skip "non-ldiskfs backend" && return
 
 	local MDT_DEV=$(mdsdevname ${SINGLEMDS//mds/})
 	local myDIR=$DIR/$tdir
@@ -9592,6 +10538,13 @@ test_228() {
 
 	# Remove old files, some OI blocks will become idle.
 	unlinkmany $myDIR/t- 10000
+
+	# stop the MDT
+	stop $SINGLEMDS || error "Fail to stop MDT."
+	# remount the MDT
+	start $SINGLEMDS $MDT_DEV $MDS_MOUNT_OPTS || error "Fail to start MDT."
+
+	df $MOUNT || error "Fail to df."
 	# Create new files, idle OI blocks should be reused.
 	createmany -o $myDIR/t- 2000
 	do_facet $SINGLEMDS sync
@@ -9603,13 +10556,109 @@ test_228() {
 
 	[ $blk1 == $blk2 ] || error "old blk1=$blk1, new blk2=$blk2, unmatched!"
 }
-run_test 228 "try to reuse idle OI blocks"
+run_test 228b "idle OI blocks can be reused after MDT restart"
+
+#LU-1881
+test_228c() {
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
+	[ "$(facet_fstype $SINGLEMDS)" != "ldiskfs" ] &&
+		skip "non-ldiskfs backend" && return
+
+	local MDT_DEV=$(mdsdevname ${SINGLEMDS//mds/})
+	local myDIR=$DIR/$tdir
+
+	mkdir -p $myDIR
+	#define OBD_FAIL_SEQ_EXHAUST             0x1002
+	$LCTL set_param fail_loc=0x80001002
+	# 20000 files can guarantee there are index nodes in the OI file
+	createmany -o $myDIR/t- 20000
+	$LCTL set_param fail_loc=0
+	# The guard is current the largest FID holder
+	touch $myDIR/guard
+	local SEQ=$($LFS path2fid $myDIR/guard | awk -F ':' '{print $1}' |
+		    tr -d '[')
+	local IDX=$(($SEQ % 64))
+
+	do_facet $SINGLEMDS sync
+	# Make sure journal flushed.
+	sleep 6
+	local blk1=$(do_facet $SINGLEMDS \
+		     "$DEBUGFS -c -R \\\"stat oi.16.${IDX}\\\" $MDT_DEV" |
+		     grep Blockcount | awk '{print $4}')
+
+	# Remove old files, some OI blocks will become idle.
+	unlinkmany $myDIR/t- 20000
+	rm -f $myDIR/guard
+	# The OI file should become empty now
+
+	# Create new files, idle OI blocks should be reused.
+	createmany -o $myDIR/t- 2000
+	do_facet $SINGLEMDS sync
+	# Make sure journal flushed.
+	sleep 6
+	local blk2=$(do_facet $SINGLEMDS \
+		     "$DEBUGFS -c -R \\\"stat oi.16.${IDX}\\\" $MDT_DEV" |
+		     grep Blockcount | awk '{print $4}')
+
+	[ $blk1 == $blk2 ] || error "old blk1=$blk1, new blk2=$blk2, unmatched!"
+}
+run_test 228c "NOT shrink the last entry in OI index node to recycle idle leaf"
+
+test_230a() {
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
+	[ $MDSCOUNT -lt 2 ] && skip "needs >= 2 MDTs" && return
+	local MDTIDX=1
+
+	mkdir -p $DIR/$tdir/test_230_local
+	local mdt_idx=$($GETSTRIPE -M $DIR/$tdir/test_230_local)
+	[ $mdt_idx -ne 0 ] &&
+		error "create local directory on wrong MDT $mdt_idx"
+
+	$LFS mkdir -i $MDTIDX $DIR/$tdir/test_230 ||
+			error "create remote directory failed"
+	local mdt_idx=$($GETSTRIPE -M $DIR/$tdir/test_230)
+	[ $mdt_idx -ne $MDTIDX ] &&
+		error "create remote directory on wrong MDT $mdt_idx"
+
+	createmany -o $DIR/$tdir/test_230/t- 10 ||
+		error "create files on remote directory failed"
+	mdt_idx=$($GETSTRIPE -M $DIR/$tdir/test_230/t-0)
+	[ $mdt_idx -ne $MDTIDX ] && error "create files on wrong MDT $mdt_idx"
+	rm -r $DIR/$tdir || error "unlink remote directory failed"
+}
+run_test 230a "Create remote directory and files under the remote directory"
+
+test_230b() {
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
+	[ $MDSCOUNT -lt 2 ] && skip "needs >= 2 MDTs" && return
+	local MDTIDX=1
+	local remote_dir=$DIR/$tdir/remote_dir
+	local rc=0
+
+	mkdir -p $DIR/$tdir
+	$LFS mkdir -i $MDTIDX $remote_dir ||
+		error "create remote directory failed"
+
+	$LFS mkdir -i 0 $remote_dir/new_dir &&
+		error "nested remote directory create succeed!"
+
+	do_facet mds$((MDTIDX + 1)) lctl set_param mdt.*.enable_remote_dir=1
+	$LFS mkdir -i 0 $remote_dir/new_dir || rc=$?
+	do_facet mds$((MDTIDX + 1)) lctl set_param mdt.*.enable_remote_dir=0
+
+	[ $rc -ne 0 ] &&
+	   error "create remote directory failed after set enable_remote_dir"
+
+	rm -r $DIR/$tdir || error "unlink remote directory failed"
+}
+run_test 230b "nested remote directory should be failed"
 
 #
 # tests that do cleanup/setup should be run at the end
 #
 
 test_900() {
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
         local ls
         #define OBD_FAIL_MGC_PAUSE_PROCESS_LOG   0x903
         $LCTL set_param fail_loc=0x903
@@ -9617,12 +10666,12 @@ test_900() {
         for ls in /proc/fs/lustre/ldlm/namespaces/MGC*/lru_size; do
                 echo "clear" > $ls
         done
-        FAIL_ON_ERROR=true cleanup
-        FAIL_ON_ERROR=true setup
+	FAIL_ON_ERROR=true cleanup
+	FAIL_ON_ERROR=true setup
 }
 run_test 900 "umount should not race with any mgc requeue thread"
 
-complete $(basename $0) $SECONDS
+complete $SECONDS
 check_and_cleanup_lustre
 if [ "$I_MOUNTED" != "yes" ]; then
 	lctl set_param debug="$OLDDEBUG" 2> /dev/null || true