X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Fsanity.sh;h=76d27ce4fbafdb4340cca1d738d21b194d1cb245;hb=13b269ab77daca78fdfc374986d4cc34c7e66309;hp=fae6a60597c971495ffb4d83e258c1bd5f012e60;hpb=c9590221dc43dd5e7a7ede389f0a7d9cf566e5bf;p=fs%2Flustre-release.git

diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh
index fae6a60..76d27ce 100644
--- a/lustre/tests/sanity.sh
+++ b/lustre/tests/sanity.sh
@@ -1,6 +1,5 @@
 #!/bin/bash
-# -*- mode: Bash; tab-width: 4; indent-tabs-mode: t; -*-
-# vim:autoindent:shiftwidth=4:tabstop=4:
+# -*- 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.
@@ -10,19 +9,18 @@ set -e
 
 ONLY=${ONLY:-"$*"}
 # bug number for skipped test: 13297 2108 9789 3637 9789 3561 12622 5188
-ALWAYS_EXCEPT="                27u   42a  42b  42c  42d  45   51d   68b  $SANITY_EXCEPT"
+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
-[ "$CPU" = "UML" ] && EXCEPT="$EXCEPT 27m 27n 27o 27p 27q 27r 31d 54a  64b 99a 99b 99c 99d 99e 99f 101"
-
-case `uname -r` in
-2.4*) FSTYPE=${FSTYPE:-ext3} ;;
-2.6*) FSTYPE=${FSTYPE:-ldiskfs} ;;
-*) error "unsupported kernel" ;;
-esac
+[ "$CPU" = "UML" ] && EXCEPT="$EXCEPT 27m 27n 27o 27p 27q 27r 31d 54a  64b 99a 99b 99c 99d 99e 99f 101a"
 
 SRCDIR=$(cd $(dirname $0); echo $PWD)
 export PATH=$PATH:/sbin
@@ -32,15 +30,13 @@ TMP=${TMP:-/tmp}
 CHECKSTAT=${CHECKSTAT:-"checkstat -v"}
 CREATETEST=${CREATETEST:-createtest}
 LFS=${LFS:-lfs}
-SETSTRIPE=${SETSTRIPE:-"$LFS setstripe"}
-GETSTRIPE=${GETSTRIPE:-"$LFS getstripe"}
-LSTRIPE=${LSTRIPE:-"$LFS setstripe"}
 LFIND=${LFIND:-"$LFS find"}
 LVERIFY=${LVERIFY:-ll_dirstripe_verify}
 LCTL=${LCTL:-lctl}
 MCREATE=${MCREATE:-mcreate}
 OPENFILE=${OPENFILE:-openfile}
 OPENUNLINK=${OPENUNLINK:-openunlink}
+export MULTIOP=${MULTIOP:-multiop}
 READS=${READS:-"reads"}
 MUNLINK=${MUNLINK:-munlink}
 SOCKETSERVER=${SOCKETSERVER:-socketserver}
@@ -66,7 +62,7 @@ init_test_env $@
 . ${CONFIG:=$LUSTRE/tests/cfg/${NAME}.sh}
 init_logging
 
-[ "$SLOW" = "no" ] && EXCEPT_SLOW="24o 24v 27m 36f 36g 36h 51b 51c 60c 63 64b 68 71 73 77f 78 101 103 115 120g 124b"
+[ "$SLOW" = "no" ] && EXCEPT_SLOW="24o 24v 27m 36f 36g 36h 51b 60c 63 64b 68 71 73 77f 78 101a 103 115 120g 124b"
 
 FAIL_ON_ERROR=false
 
@@ -159,285 +155,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"
@@ -446,7 +444,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
@@ -457,31 +455,59 @@ 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
-        $SETSTRIPE $DIR/$tdir -c -1
+	remote_mds_nodsh && skip "remote MDS with nodsh" && 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
+	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
 }
@@ -490,7 +516,8 @@ 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}
+        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 ||
@@ -498,6 +525,135 @@ 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"
+	local WDIR=$DIR/${tdir}m
+	local mds_index
+	local devname
+	local cmd
+	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
+
+	mkdir -p $WDIR
+	long_sym=$short_sym
+	# create a long symlink file
+	for ((i = 0; i < 4; ++i)); do
+		long_sym=${long_sym}${long_sym}
+	done
+
+	echo "create 512 short and long symlink files under $WDIR"
+	for ((i = 0; i < 256; ++i)); do
+		ln -sf ${long_sym}"a5a5" $WDIR/long-$i
+		ln -sf ${short_sym}"a5a5" $WDIR/short-$i
+	done
+
+	echo "erase them"
+	rm -f $WDIR/*
+	sync
+	wait_delete_completed
+
+	echo "recreate the 512 symlink files with a shorter string"
+	for ((i = 0; i < 512; ++i)); do
+		# rewrite the symlink file with a shorter string
+		ln -sf ${long_sym} $WDIR/long-$i
+		ln -sf ${short_sym} $WDIR/short-$i
+	done
+
+	mds_index=$($LFS getstripe -M $WDIR)
+	mds_index=$((mds_index+1))
+	devname=$(mdsdevname $mds_index)
+	cmd="$E2FSCK -fnvd $devname"
+
+	echo "stop and checking mds${mds_index}: $cmd"
+	# e2fsck should not return error
+	stop mds${mds_index} -f
+	do_facet mds${mds_index} $cmd || rc=$?
+
+	start mds${mds_index} $devname $MDS_MOUNT_OPTS
+	df $MOUNT > /dev/null 2>&1
+	[ $rc -ne 0 ] && error "e2fsck should not report error upon "\
+		"short/long symlink MDT: rc=$rc"
+	return $rc
+}
+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
+
+	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
@@ -543,7 +699,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
@@ -555,7 +711,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 | \
@@ -568,7 +724,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"
@@ -578,7 +734,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
@@ -592,7 +748,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
@@ -600,7 +756,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
@@ -609,8 +765,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
@@ -618,8 +774,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
@@ -628,7 +785,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
@@ -637,7 +795,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
@@ -646,8 +805,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
@@ -655,8 +815,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
@@ -665,8 +827,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
@@ -676,7 +838,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
@@ -685,7 +847,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
@@ -696,13 +859,13 @@ run_test 24k "touch .../R11a/f; mv .../R11a/f .../R11a/d ======="
 # bug 2429 - rename foo foo foo creates invalid file
 test_24l() {
 	f="$DIR/f24l"
-	multiop $f OcNs || error
+	$MULTIOP $f OcNs || error
 }
 run_test 24l "Renaming a file to itself ========================"
 
 test_24m() {
 	f="$DIR/f24m"
-	multiop $f OcLN ${f}2 ${f}2 || error "link ${f}2 ${f}2 failed"
+	$MULTIOP $f OcLN ${f}2 ${f}2 || error "link ${f}2 ${f}2 failed"
 	# on ext3 this does not remove either the source or target files
 	# though the "expected" operation would be to remove the source
 	$CHECKSTAT -t file ${f} || error "${f} missing"
@@ -723,13 +886,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
@@ -740,7 +904,8 @@ test_24p() {
 run_test 24p "mkdir .../R12{a,b}; rename .../R12a .../R12b"
 
 test_24q() {
-	mkdir $DIR/R13{a,b}
+	test_mkdir $DIR/R13a
+	test_mkdir $DIR/R13b
 	DIRINO=`ls -lid $DIR/R13a | awk '{ print $1 }'`
 	multiop_bg_pause $DIR/R13b D_c || return 1
 	MULTIPID=$!
@@ -756,7 +921,8 @@ test_24q() {
 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"
@@ -764,14 +930,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"
@@ -779,8 +949,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"
 
@@ -788,20 +959,32 @@ 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
+	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) +
@@ -810,14 +993,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)"
 
@@ -832,10 +1015,84 @@ test_24w() { # bug21506
 }
 run_test 24w "Reading a file larger than 4Gb"
 
+test_24x() {
+	[ $MDSCOUNT -lt 2 ] && skip "needs >= 2 MDTs" && 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
+	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
+	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
 }
@@ -848,22 +1105,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
@@ -886,11 +1143,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"
@@ -904,9 +1161,9 @@ 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 $DIR/d27/f0 -c 1 || error "lstripe failed"
+	$SETSTRIPE -c 1 $DIR/d27/f0 || error "setstripe failed"
 	$CHECKSTAT -t file $DIR/d27/f0 || error "checkstat failed"
 	pass
 	log "== test_27a: write to one stripe file ========================="
@@ -914,67 +1171,73 @@ test_27a() {
 }
 run_test 27a "one stripe file =================================="
 
-test_27c() {
+test_27b() {
 	[ "$OSTCOUNT" -lt "2" ] && skip_env "skipping 2-stripe test" && return
-	mkdir -p $DIR/d27
-	$SETSTRIPE $DIR/d27/f01 -c 2 || error "lstripe failed"
-	[ `$GETSTRIPE $DIR/d27/f01 | grep -A 10 obdidx | wc -l` -eq 4 ] ||
+	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 ] ||
 		error "two-stripe file doesn't have two stripes"
-	pass
-	log "== test_27c: write to two stripe file file f01 ================"
+}
+run_test 27b "create two stripe file"
+
+test_27c() {
+	[ -f $DIR/d27/f01 ] || skip "test_27b not run" && return
+
 	dd if=/dev/zero of=$DIR/d27/f01 bs=4k count=4 || error "dd failed"
 }
-run_test 27c "create two stripe file f01 ======================="
+run_test 27c "write to two stripe file"
 
 test_27d() {
-	mkdir -p $DIR/d27
-	$SETSTRIPE -c0 -i-1 -s0 $DIR/d27/fdef || error "lstripe failed"
+	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
 }
 run_test 27d "create file with default settings ================"
 
 test_27e() {
-	mkdir -p $DIR/d27
-	$SETSTRIPE $DIR/d27/f12 -c 2 || error "lstripe failed"
-	$SETSTRIPE $DIR/d27/f12 -c 2 && error "lstripe succeeded twice"
+	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"
 }
 run_test 27e "setstripe existing file (should return error) ======"
 
 test_27f() {
-	mkdir -p $DIR/d27
-	$SETSTRIPE $DIR/d27/fbad -s 100 -i 0 -c 1 && error "lstripe failed"
+	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 "lfs getstripe failed"
+	$GETSTRIPE $DIR/d27/fbad || error "$GETSTRIPE failed"
 }
 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"
-	pass
-	log "== test 27h: lfs getstripe with no objects ===================="
-	$GETSTRIPE $DIR/d27/fnone 2>&1 | grep "no stripe info" || error "has object"
-	pass
-	log "== test 27i: lfs getstripe with some objects =================="
+	$GETSTRIPE $DIR/d27/fnone 2>&1 | grep "no stripe info" ||
+		error "$DIR/d27/fnone has object"
+}
+run_test 27g "$GETSTRIPE with no objects"
+
+test_27i() {
 	touch $DIR/d27/fsome || error "touch failed"
-	$GETSTRIPE $DIR/d27/fsome | grep obdidx || error "missing objects"
+	[ $($GETSTRIPE -c $DIR/d27/fsome) -gt 0 ] || error "missing objects"
 }
-run_test 27g "test lfs getstripe ==========================================="
+run_test 27i "$GETSTRIPE with some objects"
 
 test_27j() {
-	mkdir -p $DIR/d27
-	$SETSTRIPE $DIR/d27/f27j -i $OSTCOUNT && error "lstripe failed"||true
+	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
-	$SETSTRIPE $FILE -s 67108864 || error "lstripe failed"
+	[ ! -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"
 	dd if=/dev/zero of=$FILE bs=4k count=1
@@ -984,38 +1247,39 @@ 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 $DIR/f27l -c 1 && \
-		error "lstripe should have failed" || true
+	$RUNAS $SETSTRIPE -c 1 $DIR/f27l && \
+		error "setstripe should have failed" || true
 }
 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 $DIR/d27/f27m_1 -i 0 -c 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 $DIR/d27/f27m_$i -i 0 -c 1 ; 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 =================="
 
@@ -1033,6 +1297,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
 }
 
@@ -1041,7 +1306,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
 
@@ -1059,8 +1324,8 @@ 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}
-	$SETSTRIPE $DIR/$tdir/${OST} -i $OSTIDX -c 1
+	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
 	do_facet ost$((OSTIDX + 1)) lctl set_param fail_loc=0x215
@@ -1116,7 +1381,7 @@ test_27p() {
 
 	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"
@@ -1125,7 +1390,7 @@ test_27p() {
 	exhaust_precreations 0 0x80000215
 	echo foo >> $DIR/$tdir/$tfile || error "append failed"
 	$CHECKSTAT -s 80000004 $DIR/$tdir/$tfile || error "checkstat failed"
-	$LFS getstripe $DIR/$tdir/$tfile
+	$GETSTRIPE $DIR/$tdir/$tfile
 
 	reset_enospc
 }
@@ -1139,7 +1404,7 @@ test_27q() {
 	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"
@@ -1162,18 +1427,18 @@ test_27r() {
 	rm -f $DIR/$tdir/$tfile
 	exhaust_precreations 0 0x80000215
 
-	$SETSTRIPE $DIR/$tdir/$tfile -i 0 -c 2 # && error
+	$SETSTRIPE -i 0 -c 2 $DIR/$tdir/$tfile # && error
 
 	reset_enospc
 }
 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
-	$SETSTRIPE $DIR/$tdir -s $stripe_size -c $stripe_count && \
+	$SETSTRIPE -S $stripe_size -c $stripe_count $DIR/$tdir &&
 		error "stripe width >= 2^32 succeeded" || true
 
 }
@@ -1195,7 +1460,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
 
@@ -1216,8 +1481,8 @@ test_27v() { # bug 4900
         exhaust_all_precreations 0x215
         reset_enospc
 
-        mkdir -p $DIR/$tdir
-        $SETSTRIPE $DIR/$tdir -c 1         # 1 stripe / file
+        test_mkdir -p $DIR/$tdir
+        $SETSTRIPE -c 1 $DIR/$tdir         # 1 stripe / file
 
         touch $DIR/$tdir/$tfile
         #define OBD_FAIL_TGT_DELAY_PRECREATE     0x705
@@ -1239,24 +1504,32 @@ test_27v() { # bug 4900
 run_test 27v "skip object creation on slow OST ================="
 
 test_27w() { # bug 10997
-        mkdir -p $DIR/$tdir || error "mkdir failed"
-        $LSTRIPE $DIR/$tdir/f0 -s 65536 || error "lstripe failed"
-        size=`$GETSTRIPE $DIR/$tdir/f0 -s`
-        [ $size -ne 65536 ] && error "stripe size $size != 65536" || true
-        gsdir=$($LFS getstripe -d $DIR/$tdir)
-        [ $(echo $gsdir | grep -c stripe_count) -ne 1 ] && error "$LFS getstripe -d $DIR/$tdir failed"
-
-        [ "$OSTCOUNT" -lt "2" ] && skip_env "skipping multiple stripe count/offset test" && return
-        for i in `seq 1 $OSTCOUNT`; do
-                offset=$(($i-1))
-                $LSTRIPE $DIR/$tdir/f$i -c $i -i $offset || error "lstripe -c $i -i $offset failed"
-                count=`$GETSTRIPE -c $DIR/$tdir/f$i`
-                index=`$GETSTRIPE -o $DIR/$tdir/f$i`
+        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
+        [ $($GETSTRIPE -d $DIR/$tdir | grep -c "stripe_count") -ne 1 ] &&
+                error "$GETSTRIPE -d $DIR/$tdir failed" || true
+}
+run_test 27w "check $SETSTRIPE -S option"
+
+test_27wa() {
+        [ "$OSTCOUNT" -lt "2" ] &&
+                skip_env "skipping multiple stripe count/offset test" && return
+
+        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 ||
+                        error "setstripe -c $i -i $offset failed"
+                count=$($GETSTRIPE -c $DIR/$tdir/f$i)
+                index=$($GETSTRIPE -i $DIR/$tdir/f$i)
                 [ $count -ne $i ] && error "stripe count $count != $i" || true
-                [ $index -ne $offset ] && error "stripe offset $index != $offset" || true
+                [ $index -ne $offset ] &&
+                        error "stripe offset $index != $offset" || true
         done
 }
-run_test 27w "check lfs setstripe -c -s -i options ============="
+run_test 27wa "check $SETSTRIPE -c -i options"
 
 test_27x() {
 	remote_ost_nodsh && skip "remote OST with nodsh" && return
@@ -1265,8 +1538,8 @@ test_27x() {
 	OSTIDX=0
 	local OST=$(ostname_from_index $OSTIDX)
 
-	mkdir -p $DIR/$tdir
-	$SETSTRIPE $DIR/$tdir -c 1	# 1 stripe per file
+	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
 	createmany -o $DIR/$tdir/$tfile $OSTCOUNT
@@ -1292,104 +1565,153 @@ 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 $DIR/$tdir -c 1      # 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"
 
 check_seq_oid()
 {
-        echo check file $1
-        local old_ifs="$IFS"
-        IFS=$'\t\n :'
-        lmm=($($GETSTRIPE -v $1))
+        log "check file $1"
 
+        lmm_count=$($GETSTRIPE -c $1)
+        lmm_seq=$($GETSTRIPE -v $1 | awk '/lmm_seq/ { print $2 }')
+        lmm_oid=$($GETSTRIPE -v $1 | awk '/lmm_object_id/ { print $2 }')
+
+        local old_ifs="$IFS"
         IFS=$'[:]'
         fid=($($LFS path2fid $1))
         IFS="$old_ifs"
 
+        log "FID seq ${fid[1]}, oid ${fid[2]} ver ${fid[3]}"
+        log "LOV seq $lmm_seq, oid $lmm_oid, count: $lmm_count"
+
         # compare lmm_seq and lu_fid->f_seq
-        [ ${lmm[4]} = ${fid[1]} ] || { error "SEQ mismatch"; return 1; }
+        [ $lmm_seq = ${fid[1]} ] || { error "SEQ mismatch"; return 1; }
         # compare lmm_object_id and lu_fid->oid
-        [ ${lmm[6]} = ${fid[2]} ] || { error "OID mismatch"; return 2; }
+        [ $lmm_oid = ${fid[2]} ] || { error "OID mismatch"; return 2; }
 
-        echo -e "\tseq ${fid[1]}, oid ${fid[2]} ver ${fid[3]}\n\tstripe count: ${lmm[8]}"
+        # check the trusted.fid attribute of the OST objects of the file
+        local have_obdidx=false
+        local stripe_nr=0
+        $GETSTRIPE $1 | while read obdidx oid hex seq; do
+                # skip lines up to and including "obdidx"
+                [ -z "$obdidx" ] && break
+                [ "$obdidx" = "obdidx" ] && have_obdidx=true && continue
+                $have_obdidx || continue
+
+                local ost=$((obdidx + 1))
+                local dev=$(ostdevname $ost)
+
+		if [ $(facet_fstype ost$ost) != ldiskfs ]; then
+			echo "Currently only works with ldiskfs-based OSTs"
+			continue
+		fi
 
-        [ "$FSTYPE" != "ldiskfs" ] && skip "can not check trusted.fid FSTYPE=$FSTYPE" && return 0
+                log "want: stripe:$stripe_nr ost:$obdidx oid:$oid/$hex seq:$seq"
 
-        # check the trusted.fid attribute of the OST objects of the file
-        for (( i=0, j=21; i < ${lmm[8]}; i++, j+=4 )); do
-                local obdidx=${lmm[$j]}
-                local devnum=$((obdidx + 1))
-                local objid=${lmm[$((j+1))]}
-                local group=${lmm[$((j+3))]}
-                local dev=$(ostdevname $devnum)
-                local dir=$(facet_mntpt ost$devnum)
-
-                stop ost$devnum
-                do_facet ost$devnum mount -t $FSTYPE $dev $dir $OST_MOUNT_OPTS ||
-                        { error "mounting $dev as $FSTYPE failed"; return 3; }
-
-                obj_filename=$(do_facet ost$devnum find $dir/O/$group -name $objid)
-                local ff=$(do_facet ost$devnum $LL_DECODE_FILTER_FID $obj_filename)
-                IFS=$'/= [:]'
-                ff=($(echo $ff))
-                IFS="$old_ifs"
+                #don't unmount/remount the OSTs if we don't need to do that
+                #local dir=$(facet_mntpt ost$ost)
+                #stop ost$dev
+                #do_facet ost$dev mount -t $FSTYPE $dev $dir $OST_MOUNT_OPTS ||
+                #       { 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"
+                local ff=$(do_facet ost$ost "$DEBUGFS -c -R 'stat $obj_file' \
+                           $dev 2>/dev/null" | grep "parent=")
+
+                [ -z "$ff" ] && error "$obj_file: no filter_fid info"
+
+                echo "$ff" | sed -e 's#.*objid=#got: objid=#'
+
+                #do_facet ost$ost umount -d $dir
+                #start ost$ost $dev $OST_MOUNT_OPTS
+
+                # /mnt/O/0/d23/23: objid=23 seq=0 parent=[0x200000400:0x1e:0x1]
+                # fid: objid=23 seq=0 parent=[0x200000400:0x1e:0x0] stripe=1
+                local ff_parent=$(echo $ff|sed -e 's/.*parent=.//')
+                local ff_pseq=$(echo $ff_parent | cut -d: -f1)
+                local ff_poid=$(echo $ff_parent | cut -d: -f2)
+                local ff_pstripe=$(echo $ff_parent | sed -e 's/.*stripe=//')
 
                 # compare lmm_seq and filter_fid->ff_parent.f_seq
-                [ ${ff[11]} = ${lmm[4]} ] || { error "parent SEQ mismatch"; return 4; }
+                [ $ff_pseq = $lmm_seq ] ||
+                        error "FF parent SEQ $ff_pseq != $lmm_seq"
                 # compare lmm_object_id and filter_fid->ff_parent.f_oid
-                [ ${ff[12]} = ${lmm[6]} ] || { error "parent OID mismatch"; return 5; }
-                let stripe=${ff[13]}
-                [ $stripe -eq $i ] || { error "stripe mismatch"; return 6; }
+                [ $ff_poid = $lmm_oid ] ||
+                        error "FF parent OID $ff_poid != $lmm_oid"
+                [ $ff_pstripe = $stripe_nr ] ||
+                        error "FF stripe $ff_pstripe != $stripe_nr"
 
-                echo -e "\t\tost $obdidx, objid $objid, group $group"
-                do_facet ost$devnum umount -d $dir
-                start ost$devnum $dev $OST_MOUNT_OPTS
+                stripe_nr=$((stripe_nr + 1))
         done
 }
 
 test_27z() {
         remote_ost_nodsh && skip "remote OST with nodsh" && return
-        mkdir -p $DIR/$tdir
-        $SETSTRIPE $DIR/$tdir/$tfile-1 -c 1 -o 0 -s 1m ||
-                { error "setstripe -c 1 failed"; return 1; }
+        test_mkdir -p $DIR/$tdir
+
+        $SETSTRIPE -c 1 -i 0 -S 64k $DIR/$tdir/$tfile-1 ||
+                { error "setstripe -c -1 failed"; return 1; }
+        # We need to send a write to every object to get parent FID info set.
+        # This _should_ also work for setattr, but does not currently.
+        # touch $DIR/$tdir/$tfile-1 ||
         dd if=/dev/zero of=$DIR/$tdir/$tfile-1 bs=1M count=1 ||
-                { error "dd 1 mb failed"; return 2; }
-        $SETSTRIPE $DIR/$tdir/$tfile-2 -c -1 -o $(($OSTCOUNT - 1)) -s 1m ||
+                { error "dd $tfile-1 failed"; return 2; }
+        $SETSTRIPE -c -1 -i $((OSTCOUNT - 1)) -S 1M $DIR/$tdir/$tfile-2 ||
                 { error "setstripe -c -1 failed"; return 3; }
         dd if=/dev/zero of=$DIR/$tdir/$tfile-2 bs=1M count=$OSTCOUNT ||
-                { error "dd $OSTCOUNT mb failed"; return 4; }
-        sync
+                { error "dd $tfile-2 failed"; return 4; }
+
+        # make sure write RPCs have been sent to OSTs
+        sync; sleep 5; sync
 
         check_seq_oid $DIR/$tdir/$tfile-1 || return 5
         check_seq_oid $DIR/$tdir/$tfile-2 || return 6
@@ -1397,32 +1719,33 @@ test_27z() {
 run_test 27z "check SEQ/OID on the MDT and OST filesystems"
 
 test_27A() { # b=19102
-        local restore_size=`$GETSTRIPE -s $MOUNT`
-        local restore_count=`$GETSTRIPE -c $MOUNT`
-        local restore_offset=`$GETSTRIPE -o $MOUNT`
-        $SETSTRIPE -c 0 -o -1 -s 0 $MOUNT
-        local default_size=`$GETSTRIPE -s $MOUNT`
-        local default_count=`$GETSTRIPE -c $MOUNT`
-        local default_offset=`$GETSTRIPE -o $MOUNT`
+        local restore_size=$($GETSTRIPE -S $MOUNT)
+        local restore_count=$($GETSTRIPE -c $MOUNT)
+        local restore_offset=$($GETSTRIPE -i $MOUNT)
+        $SETSTRIPE -c 0 -i -1 -S 0 $MOUNT
+        local default_size=$($GETSTRIPE -S $MOUNT)
+        local default_count=$($GETSTRIPE -c $MOUNT)
+        local default_offset=$($GETSTRIPE -i $MOUNT)
         local dsize=$((1024 * 1024))
-        [ $default_size -eq $dsize ] || error "stripe size $default_size != $dsize"
+        [ $default_size -eq $dsize ] ||
+                error "stripe size $default_size != $dsize"
         [ $default_count -eq 1 ] || error "stripe count $default_count != 1"
-        [ $default_offset -eq -1 ] || error "stripe offset $default_offset != -1"
-        $SETSTRIPE -c $restore_count -o $restore_offset -s $restore_size $MOUNT
+        [ $default_offset -eq -1 ] ||error "stripe offset $default_offset != -1"
+        $SETSTRIPE -c $restore_count -i $restore_offset -S $restore_size $MOUNT
 }
 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() {
 	cancel_lru_locks mdc
-	mkdir $DIR/d29
+	test_mkdir $DIR/d29
 	touch $DIR/d29/foo
 	log 'first d29'
 	ls -l $DIR/d29
@@ -1502,7 +1825,7 @@ run_test 31a "open-unlink file =================================="
 test_31b() {
 	touch $DIR/f31 || error
 	ln $DIR/f31 $DIR/f31b || error
-	multiop $DIR/f31b Ouc || error
+	$MULTIOP $DIR/f31b Ouc || error
 	$CHECKSTAT -t file $DIR/f31 || error
 }
 run_test 31b "unlink file with multiple links while open ======="
@@ -1512,7 +1835,7 @@ test_31c() {
 	ln $DIR/f31 $DIR/f31c || error
 	multiop_bg_pause $DIR/f31 O_uc || return 1
 	MULTIPID=$!
-	multiop $DIR/f31c Ouc
+	$MULTIOP $DIR/f31c Ouc
 	kill -USR1 $MULTIPID
 	wait $MULTIPID
 }
@@ -1532,8 +1855,8 @@ run_test 31e "remove of open non-empty directory ==============="
 
 test_31f() { # bug 4554
 	set -vx
-	mkdir $DIR/d31f
-	$SETSTRIPE $DIR/d31f -s 1048576 -c 1
+	test_mkdir $DIR/d31f
+	$SETSTRIPE -S 1048576 -c 1 $DIR/d31f
 	cp /etc/hosts $DIR/d31f
 	ls -l $DIR/d31f
 	$GETSTRIPE $DIR/d31f/hosts
@@ -1541,8 +1864,8 @@ test_31f() { # bug 4554
 	MULTIPID=$!
 
 	rm -rv $DIR/d31f || error "first of $DIR/d31f"
-	mkdir $DIR/d31f
-	$SETSTRIPE $DIR/d31f -s 1048576 -c 1
+	test_mkdir $DIR/d31f
+	$SETSTRIPE -S 1048576 -c 1 $DIR/d31f
 	cp /etc/hosts $DIR/d31f
 	ls -l $DIR/d31f
 	$GETSTRIPE $DIR/d31f/hosts
@@ -1562,7 +1885,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"
@@ -1574,8 +1898,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"
@@ -1587,8 +1911,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"
@@ -1600,8 +1924,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"
@@ -1612,7 +1936,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"
@@ -1627,9 +1951,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"
@@ -1641,48 +1965,57 @@ 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() {
 	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
+	[ -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
+	[ -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
+	[ -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
@@ -1693,7 +2026,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
@@ -1704,7 +2037,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
@@ -1717,7 +2051,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
@@ -1726,50 +2061,54 @@ 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
+	[ -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
+	[ -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
+	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
+	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
@@ -1780,7 +2119,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
@@ -1792,7 +2131,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
@@ -1811,7 +2150,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
@@ -1826,27 +2165,34 @@ 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
+	[ -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
+	[ -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
@@ -1855,11 +2201,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 && \
@@ -1869,7 +2215,7 @@ 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
 }
@@ -1884,7 +2230,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
@@ -1940,6 +2286,31 @@ test_33c() {
 }
 run_test 33c "test llobdstat and write_bytes"
 
+test_33d() {
+	[ $MDSCOUNT -lt 2 ] && skip "needs >= 2 MDTs" && 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
@@ -2018,6 +2389,25 @@ test_34g() {
 }
 run_test 34g "truncate long file ==============================="
 
+test_34h() {
+	local gid=10
+	local sz=1000
+
+	dd if=/dev/zero of=$DIR/$tfile bs=1M count=10 || error
+	$MULTIOP $DIR/$tfile OG${gid}T${sz}g${gid}c &
+	MULTIPID=$!
+	sleep 2
+
+	if [[ `ps h -o comm -p $MULTIPID` == "multiop" ]]; then
+		error "Multiop blocked on ftruncate, pid=$MULTIPID"
+		kill -9 $MULTIPID
+	fi
+	wait $MULTIPID
+	local nsz=`stat -c %s $DIR/$tfile`
+	[[ $nsz == $sz ]] || error "New size wrong $nsz != $sz"
+}
+run_test 34h "ftruncate file under grouplock should not block"
+
 test_35a() {
 	cp /bin/sh $DIR/f35a
 	chmod 444 $DIR/f35a
@@ -2041,7 +2431,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
 }
@@ -2056,7 +2446,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
@@ -2070,7 +2460,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
@@ -2102,7 +2492,7 @@ test_36g() {
 	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")
@@ -2128,15 +2518,7 @@ test_36h() {
 }
 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
@@ -2170,7 +2552,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
@@ -2365,10 +2747,14 @@ test_39i() {
 run_test 39i "write, rename, stat =============================="
 
 test_39j() {
+	start_full_debug_logging
 	touch $DIR1/$tfile
 	sleep 1
 
-	multiop_bg_pause $DIR1/$tfile oO_RDWR:w2097152_c || error "multiop failed"
+	#define OBD_FAIL_OSC_DELAY_SETTIME	 0x412
+	lctl set_param fail_loc=0x80000412
+	multiop_bg_pause $DIR1/$tfile oO_RDWR:w2097152_c ||
+		error "multiop failed"
 	local multipid=$!
 	local mtime1=`stat -c %Y $DIR1/$tfile`
 
@@ -2379,12 +2765,15 @@ test_39j() {
 
 	for (( i=0; i < 2; i++ )) ; do
 		local mtime2=`stat -c %Y $DIR1/$tfile-1`
-		[ "$mtime1" = "$mtime2" ] || \
-			error "mtime is lost on close: $mtime2, should be $mtime1"
+		[ "$mtime1" = "$mtime2" ] ||
+			error "mtime is lost on close: $mtime2, " \
+			      "should be $mtime1"
 
 		cancel_lru_locks osc
 		if [ $i = 0 ] ; then echo "repeat after cancel_lru_locks"; fi
 	done
+	lctl set_param fail_loc=0
+	stop_full_debug_logging
 }
 run_test 39j "write, rename, close, stat ======================="
 
@@ -2418,15 +2807,16 @@ TEST_39_ATIME=`date -d "1 year" +%s`
 
 test_39l() {
 	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)
@@ -2436,9 +2826,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
@@ -2450,7 +2840,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
@@ -2460,7 +2850,8 @@ 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 ==========================="
 
@@ -2650,8 +3041,8 @@ test_42e() { # bug22074
 	local max_dirty_mb
 	local warmup_files
 
-	mkdir -p $TDIR
-	$LFS setstripe -c 1 $TDIR
+	test_mkdir -p $DIR/${tdir}e
+	$SETSTRIPE -c 1 $TDIR
 	createmany -o $TDIR/f $files
 
 	max_dirty_mb=$($LCTL get_param -n $proc_osc0/max_dirty_mb)
@@ -2664,7 +3055,7 @@ test_42e() { # bug22074
 	# write a large amount of data into one file and sync, to get good
 	# avail_grant number from OST.
 	for ((i=0; i<$warmup_files; i++)); do
-		idx=$($LFS getstripe -i $TDIR/w$i)
+		idx=$($GETSTRIPE -i $TDIR/w$i)
 		[ $idx -ne 0 ] && continue
 		dd if=/dev/zero of=$TDIR/w$i bs="$max_dirty_mb"M count=1
 		break
@@ -2678,7 +3069,7 @@ test_42e() { # bug22074
 	# RPCs directly. but depends on the env, VFS may trigger flush during this
 	# period, hopefully we are good.
 	for ((i=0; i<$warmup_files; i++)); do
-		idx=$($LFS getstripe -i $TDIR/w$i)
+		idx=$($GETSTRIPE -i $TDIR/w$i)
 		[ $idx -ne 0 ] && continue
 		dd if=/dev/zero of=$TDIR/w$i bs=1M count=1 2>/dev/null
 	done
@@ -2688,7 +3079,7 @@ test_42e() { # bug22074
 	# perform the real test
 	$LCTL set_param $proc_osc0/rpc_stats 0
 	for ((;i<$files; i++)); do
-		[ $($LFS getstripe -i $TDIR/f$i) -eq 0 ] || continue
+		[ $($GETSTRIPE -i $TDIR/f$i) -eq 0 ] || continue
 		dd if=/dev/zero of=$TDIR/f$i bs=$pagesz count=$pages 2>/dev/null
 	done
 	sync
@@ -2717,9 +3108,9 @@ 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 &
+	$MULTIOP $DIR/$tdir/$tfile Ow_c &
 	pid=$!
 	# give multiop a chance to open
 	sleep 1
@@ -2730,11 +3121,13 @@ 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
+	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
@@ -2742,11 +3135,13 @@ 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
+	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
@@ -2754,8 +3149,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)
@@ -2862,20 +3257,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"
@@ -2884,19 +3281,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
@@ -2907,19 +3307,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
@@ -2930,23 +3332,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)"
 
@@ -2954,156 +3360,152 @@ 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
+	# get ost1 size - lustre-OST0000
+	ost1_size=$(do_facet ost1 lfs df |grep ${ost1_svc} |awk '{print $4}')
+	# write 800M at maximum
+	[ $ost1_size -gt 819200 ] && ost1_size=819200
+
+	lfs setstripe -c 1 -i 0 $DIR/$tfile
+	dd if=/dev/zero of=$DIR/$tfile bs=4k count=$((ost1_size >> 2)) &
+	local dd_pid=$!
+
+	# change max_pages_per_rpc while writing the file
+	local osc1_mppc=osc.$(get_osc_import_name client ost1).max_pages_per_rpc
+	local orig_mppc=`$LCTL get_param -n $osc1_mppc`
+	# loop until dd process exits
+	while ps ax -opid | grep -wq $dd_pid; do
+		$LCTL set_param $osc1_mppc=$((RANDOM % 256 + 1))
+		sleep $((RANDOM % 5 + 1))
+	done
+	# restore original max_pages_per_rpc
+	$LCTL set_param $osc1_mppc=$orig_mppc
+	rm $DIR/$tfile || error "rm $DIR/$tfile failed"
+}
+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 $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)" && \
-		return
+	local BASE=$DIR/$tdir
 
-	[ $NUMFREE -lt $NUMTEST ] && NUMTEST=$(($NUMFREE - 50))
-
-	mkdir -p $DIR/d51b
-	createmany -d $DIR/d51b/t- $NUMTEST
-}
-run_test 51b "mkdir .../t-0 --- .../t-$NUMTEST ===================="
-
-test_51ba() { # LU-993
-        local BASE=$DIR/d51b
-        # unlink all but 100 subdirectories, then check it still works
-        local LEFT=100
-        local DELETE=$((NUMTEST - LEFT))
+	test_mkdir -p $BASE
 
-        ! [ -d "${BASE}/t-$DELETE" ] && skip "test_51b() not run" && return 0
+	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
 
-        # 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"
+	[ $numfree -lt $NUMTEST ] && NUMTEST=$(($numfree - 50)) &&
+		echo "reduced count to $NUMTEST due to inodes"
 
-        log "nlink between: $(stat -c %h $BASE)"
-        local FOUND=$(ls -l ${BASE} | wc -l)
-        FOUND=$((FOUND - 1))  # trim the first line of ls output
-        [ $FOUND -ne $LEFT ] &&
-                error "can't find subdirs: found only $FOUND/$LEFT"
+	# 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"
 
-        unlinkmany -d $BASE/t- $DELETE $LEFT ||
-                error "unlink of second $LEFT subdirs failed"
-        log "nlink after: $(stat -c %h $BASE)"
+	createmany -d $BASE/d $NUMTEST && echo $NUMTEST > $BASE/fnum ||
+		echo "failed" > $BASE/fnum
 }
-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
+run_test 51b "exceed 64k subdirectory nlink limit"
 
-	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"
-}
-run_test 51bb "mkdir createmany CMD $MDSCOUNT  ===================="
+test_51ba() { # LU-993
+	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}/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
+	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
 
-test_51c() {
-	[ ! -d $DIR/d51b ] && skip "$DIR/51b missing" && \
-		return
+	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 $DIR/d51b/t- $NUMTEST
+	unlinkmany -d $BASE/d $DELETE $LEFT ||
+		error "unlink of second $LEFT subdirs failed"
+	# 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 51c "rmdir .../t-0 --- .../t-$NUMTEST ===================="
+run_test 51ba "verify nlink for many subdirectory cleanup"
 
 test_51d() {
         [  "$OSTCOUNT" -lt "3" ] && skip_env "skipping test with few OSTs" && return
-        mkdir -p $DIR/d51d
-        createmany -o $DIR/d51d/t- 1000
-        $LFS 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
@@ -3122,40 +3524,44 @@ 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) ======="
 
@@ -3227,7 +3633,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
@@ -3259,73 +3665,79 @@ 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 -eq $NUMFILESx2 ] || error \
-                "lfs getstripe --recursive $DIR/d56 wrong: found $FILENUM, expected $NUMFILESx2"
-        FILENUM=`$GETSTRIPE $DIR/d56 | grep -c obdidx`
-        [ $FILENUM -eq $NUMFILES ] || error \
-                "lfs getstripe $DIR/d56 without --recursive wrong: found $FILENUM, expected $NUMFILES"
-        echo "lfs getstripe --recursive passed."
+        FILENUM=`$GETSTRIPE --recursive $DIR/$tdir | grep -c obdidx`
+        [ $FILENUM -eq $NUMFILESx2 ] ||
+                error "$GETSTRIPE --recursive: found $FILENUM, not $NUMFILESx2"
+        FILENUM=`$GETSTRIPE $DIR/$tdir | grep -c obdidx`
+        [ $FILENUM -eq $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 \
-                 "lfs getstripe $DIR/d56/file1 wrong:found $FILENUM, expected 1"
-        echo "lfs getstripe file passed."
+                 "$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 "lfs getstripe --verbose $DIR/d56 wrong: should find $NUMFILES lmm_magic info"
-        [ `$GETSTRIPE $DIR/d56 | grep -c lmm_magic` -eq 0 ] || error \
-                "lfs getstripe $DIR/d56 without --verbose wrong: should not show lmm_magic info"
-        echo "lfs getstripe --verbose passed."
+        [ `$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" || \
-                error "lfs getstripe --obd wrong_uuid should return error message"
+        $GETSTRIPE --obd wrong_uuid $DIR/$tdir 2>&1 |
+					grep -q "unknown obduuid" ||
+                error "$GETSTRIPE --obd wrong_uuid should return error message"
+
+        [  "$OSTCOUNT" -lt 2 ] &&
+                skip_env "skipping other $GETSTRIPE --obd test" && return
 
-        [  "$OSTCOUNT" -lt 2 ] && \
-                skip_env "skipping other lfs getstripe --obd test" && return
         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`
-        [ $FOUND -eq $FILENUM ] || \
-                error "lfs getstripe --obd wrong: found $FOUND, expected $FILENUM"
-        [ `$GETSTRIPE -r -v --obd $OBDUUID $DIR/d56 | \
-                sed '/^[	 ]*'${OSTIDX}'[	 ]/d' |\
-                sed -n '/^[	 ]*[0-9][0-9]*[	 ]/p' | wc -l` -eq 0 ] || \
-                error "lfs getstripe --obd wrong: should not show file on other obd"
-        echo "lfs getstripe --obd passed."
-}
-run_test 56a "check lfs getstripe ===================================="
+        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/$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"
+        echo "$GETSTRIPE --obd passed"
+}
+run_test 56a "check $GETSTRIPE"
 
 NUMFILES=3
 NUMDIRS=3
 setup_56() {
-        LOCAL_NUMFILES=$1
-        LOCAL_NUMDIRS=$2
-        if [ ! -d "$DIR/${tdir}g" ] ; then
-                mkdir -p $DIR/${tdir}g
+        local LOCAL_NUMFILES="$1"
+        local LOCAL_NUMDIRS="$2"
+        local MKDIR_PARAMS="$3"
+
+        if [ ! -d "$TDIR" ] ; then
+                test_mkdir -p $TDIR
+                [ "$MKDIR_PARAMS" ] && $SETSTRIPE $MKDIR_PARAMS $TDIR
                 for i in `seq 1 $LOCAL_NUMFILES` ; do
-                        touch $DIR/${tdir}g/file$i
+                        touch $TDIR/file$i
                 done
                 for i in `seq 1 $LOCAL_NUMDIRS` ; do
-                        mkdir $DIR/${tdir}g/dir$i
+                        test_mkdir $TDIR/dir$i
                         for j in `seq 1 $LOCAL_NUMFILES` ; do
-                                touch $DIR/${tdir}g/dir$i/file$j
+                                touch $TDIR/dir$i/file$j
                         done
                 done
         fi
@@ -3334,7 +3746,6 @@ setup_56() {
 setup_56_special() {
 	LOCAL_NUMFILES=$1
 	LOCAL_NUMDIRS=$2
-	TDIR=$DIR/${tdir}g
 	setup_56 $1 $2
 	if [ ! -e "$TDIR/loop1b" ] ; then
 		for i in `seq 1 $LOCAL_NUMFILES` ; do
@@ -3351,99 +3762,111 @@ setup_56_special() {
 }
 
 test_56g() {
-        $LSTRIPE -d $DIR
+        $SETSTRIPE -d $DIR
 
+        TDIR=$DIR/${tdir}g
         setup_56 $NUMFILES $NUMDIRS
 
         EXPECTED=$(($NUMDIRS + 2))
         # test lfs find with -name
-        for i in `seq 1 $NUMFILES` ; do
-                NUMS=`$LFIND -name "*$i" $DIR/${tdir}g | wc -l`
-                [ $NUMS -eq $EXPECTED ] || error \
-                        "lfs find -name \"*$i\" $DIR/${tdir}g wrong: found $NUMS, expected $EXPECTED"
+        for i in $(seq 1 $NUMFILES) ; do
+                NUMS=$($LFIND -name "*$i" $TDIR | wc -l)
+                [ $NUMS -eq $EXPECTED ] ||
+                        error "lfs find -name \"*$i\" $TDIR wrong: "\
+                              "found $NUMS, expected $EXPECTED"
         done
-        echo "lfs find -name passed."
 }
 run_test 56g "check lfs find -name ============================="
 
 test_56h() {
-        $LSTRIPE -d $DIR
+        $SETSTRIPE -d $DIR
 
+        TDIR=$DIR/${tdir}g
         setup_56 $NUMFILES $NUMDIRS
 
-        EXPECTED=$((($NUMDIRS+1)*($NUMFILES-1)+$NUMFILES))
+        EXPECTED=$(((NUMDIRS + 1) * (NUMFILES - 1) + NUMFILES))
         # test lfs find with ! -name
-        for i in `seq 1 $NUMFILES` ; do
-                NUMS=`$LFIND ! -name "*$i" $DIR/${tdir}g | wc -l`
-                [ $NUMS -eq $EXPECTED ] || error \
-                        "lfs find ! -name \"*$i\" $DIR/${tdir}g wrong: found $NUMS, expected $EXPECTED"
+        for i in $(seq 1 $NUMFILES) ; do
+                NUMS=$($LFIND ! -name "*$i" $TDIR | wc -l)
+                [ $NUMS -eq $EXPECTED ] ||
+                        error "lfs find ! -name \"*$i\" $TDIR wrong: "\
+                              "found $NUMS, expected $EXPECTED"
         done
-        echo "lfs find ! -name passed."
 }
 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)
-       OUT=$($LFIND -obd $UUID $DIR/$tdir)
-       [ "$OUT" ] && error "$LFIND -obd returned directory '$OUT'" || true
+       CMD="$LFIND -ost $UUID $DIR/$tdir"
+       OUT=$($CMD)
+       [ -z "$OUT" ] || error "\"$CMD\" returned directory '$OUT'"
 }
-run_test 56i "check 'lfs find -obd UUID' skips directories ======="
+run_test 56i "check 'lfs find -ost UUID' skips directories ======="
 
 test_56j() {
+	TDIR=$DIR/${tdir}g
 	setup_56_special $NUMFILES $NUMDIRS
 
-	EXPECTED=$((NUMDIRS+1))
-	NUMS=`$LFIND -type d $DIR/${tdir}g | wc -l`
-	[ $NUMS -eq $EXPECTED ] || \
-		error "lfs find -type d $DIR/${tdir}g wrong: found $NUMS, expected $EXPECTED"
+	EXPECTED=$((NUMDIRS + 1))
+	CMD="$LFIND -type d $TDIR"
+	NUMS=$($CMD | wc -l)
+	[ $NUMS -eq $EXPECTED ] ||
+		error "\"$CMD\" wrong: found $NUMS, expected $EXPECTED"
 }
 run_test 56j "check lfs find -type d ============================="
 
 test_56k() {
+	TDIR=$DIR/${tdir}g
 	setup_56_special $NUMFILES $NUMDIRS
 
-	EXPECTED=$(((NUMDIRS+1) * NUMFILES))
-	NUMS=`$LFIND -type f $DIR/${tdir}g | wc -l`
-	[ $NUMS -eq $EXPECTED ] || \
-		error "lfs find -type f $DIR/${tdir}g wrong: found $NUMS, expected $EXPECTED"
+	EXPECTED=$(((NUMDIRS + 1) * NUMFILES))
+	CMD="$LFIND -type f $TDIR"
+	NUMS=$($CMD | wc -l)
+	[ $NUMS -eq $EXPECTED ] ||
+		error "\"$CMD\" wrong: found $NUMS, expected $EXPECTED"
 }
 run_test 56k "check lfs find -type f ============================="
 
 test_56l() {
+	TDIR=$DIR/${tdir}g
 	setup_56_special $NUMFILES $NUMDIRS
 
 	EXPECTED=$((NUMDIRS + NUMFILES))
-	NUMS=`$LFIND -type b $DIR/${tdir}g | wc -l`
-	[ $NUMS -eq $EXPECTED ] || \
-		error "lfs find -type b $DIR/${tdir}g wrong: found $NUMS, expected $EXPECTED"
+	CMD="$LFIND -type b $TDIR"
+	NUMS=$($CMD | wc -l)
+	[ $NUMS -eq $EXPECTED ] ||
+		error "\"$CMD\" wrong: found $NUMS, expected $EXPECTED"
 }
 run_test 56l "check lfs find -type b ============================="
 
 test_56m() {
+	TDIR=$DIR/${tdir}g
 	setup_56_special $NUMFILES $NUMDIRS
 
 	EXPECTED=$((NUMDIRS + NUMFILES))
-	NUMS=`$LFIND -type c $DIR/${tdir}g | wc -l`
-	[ $NUMS -eq $EXPECTED ] || \
-		error "lfs find -type c $DIR/${tdir}g wrong: found $NUMS, expected $EXPECTED"
+	CMD="$LFIND -type c $TDIR"
+	NUMS=$($CMD | wc -l)
+	[ $NUMS -eq $EXPECTED ] ||
+		error "\"$CMD\" wrong: found $NUMS, expected $EXPECTED"
 }
 run_test 56m "check lfs find -type c ============================="
 
 test_56n() {
+	TDIR=$DIR/${tdir}g
 	setup_56_special $NUMFILES $NUMDIRS
 
 	EXPECTED=$((NUMDIRS + NUMFILES))
-	NUMS=`$LFIND -type l $DIR/${tdir}g | wc -l`
-	[ $NUMS -eq $EXPECTED ] || \
-		error "lfs find -type l $DIR/${tdir}g wrong: found $NUMS, expected $EXPECTED"
+	CMD="$LFIND -type l $TDIR"
+	NUMS=$($CMD | wc -l)
+	[ $NUMS -eq $EXPECTED ] ||
+		error "\"$CMD\" wrong: found $NUMS, expected $EXPECTED"
 }
 run_test 56n "check lfs find -type l ============================="
 
 test_56o() {
-	TDIR=$DIR/${tdir}g
-	rm -rf $TDIR
+	TDIR=$DIR/${tdir}o
 	setup_56 $NUMFILES $NUMDIRS
 
 	utime $TDIR/file1 > /dev/null || error "utime (1)"
@@ -3459,121 +3882,366 @@ test_56o() {
 		error "lfs find -mtime +0 $TDIR wrong: found $NUMS, expected $EXPECTED"
 
 	EXPECTED=12
-	NUMS=`$LFIND -mtime 0 $TDIR | wc -l`
-	[ $NUMS -eq $EXPECTED ] || \
-		error "lfs find -mtime 0 $TDIR wrong: found $NUMS, expected $EXPECTED"
-
+	CMD="$LFIND -mtime 0 $TDIR"
+	NUMS=$($CMD | wc -l)
+	[ $NUMS -eq $EXPECTED ] ||
+		error "\"$CMD\" wrong: found $NUMS, expected $EXPECTED"
 }
 run_test 56o "check lfs find -mtime for old files =========================="
 
 test_56p() {
-	[ $RUNAS_ID -eq $UID ] && skip_env "RUNAS_ID = UID = $UID -- skipping" && return
-
-	TDIR=$DIR/${tdir}g
-	rm -rf $TDIR
+	[ $RUNAS_ID -eq $UID ] &&
+		skip_env "RUNAS_ID = UID = $UID -- skipping" && return
 
+	TDIR=$DIR/${tdir}p
 	setup_56 $NUMFILES $NUMDIRS
 
 	chown $RUNAS_ID $TDIR/file* || error "chown $DIR/${tdir}g/file$i failed"
 	EXPECTED=$NUMFILES
-	NUMS="`$LFIND -uid $RUNAS_ID $TDIR | wc -l`"
+	CMD="$LFIND -uid $RUNAS_ID $TDIR"
+	NUMS=$($CMD | wc -l)
 	[ $NUMS -eq $EXPECTED ] || \
-		error "lfs find -uid $TDIR wrong: found $NUMS, expected $EXPECTED"
+		error "\"$CMD\" wrong: found $NUMS, expected $EXPECTED"
 
-	EXPECTED=$(( ($NUMFILES+1) * $NUMDIRS + 1))
-	NUMS="`$LFIND ! -uid $RUNAS_ID $TDIR | wc -l`"
+	EXPECTED=$(((NUMFILES + 1) * NUMDIRS + 1))
+	CMD="$LFIND ! -uid $RUNAS_ID $TDIR"
+	NUMS=$($CMD | wc -l)
 	[ $NUMS -eq $EXPECTED ] || \
-		error "lfs find ! -uid $TDIR wrong: found $NUMS, expected $EXPECTED"
-
-	echo "lfs find -uid and ! -uid passed."
+		error "\"$CMD\" wrong: found $NUMS, expected $EXPECTED"
 }
 run_test 56p "check lfs find -uid and ! -uid ==============================="
 
 test_56q() {
-	[ $RUNAS_ID -eq $UID ] && skip_env "RUNAS_ID = UID = $UID -- skipping" && return
-
-	TDIR=$DIR/${tdir}g
-        rm -rf $TDIR
+	[ $RUNAS_ID -eq $UID ] &&
+		skip_env "RUNAS_ID = UID = $UID -- skipping" && return
 
+	TDIR=$DIR/${tdir}q
 	setup_56 $NUMFILES $NUMDIRS
 
-	chgrp $RUNAS_GID $TDIR/file* || error "chown $DIR/${tdir}g/file$i failed"
+	chgrp $RUNAS_GID $TDIR/file* || error "chown $TDIR/file$i failed"
+
 	EXPECTED=$NUMFILES
-	NUMS="`$LFIND -gid $RUNAS_GID $TDIR | wc -l`"
-	[ $NUMS -eq $EXPECTED ] || \
-		error "lfs find -gid $TDIR wrong: found $NUMS, expected $EXPECTED"
+	CMD="$LFIND -gid $RUNAS_GID $TDIR"
+	NUMS=$($CMD | wc -l)
+	[ $NUMS -eq $EXPECTED ] ||
+		error "\"$CMD\" wrong: found $NUMS, expected $EXPECTED"
 
 	EXPECTED=$(( ($NUMFILES+1) * $NUMDIRS + 1))
-	NUMS="`$LFIND ! -gid $RUNAS_GID $TDIR | wc -l`"
-	[ $NUMS -eq $EXPECTED ] || \
-		error "lfs find ! -gid $TDIR wrong: found $NUMS, expected $EXPECTED"
-
-	echo "lfs find -gid and ! -gid passed."
+	CMD="$LFIND ! -gid $RUNAS_GID $TDIR"
+	NUMS=$($CMD | wc -l)
+	[ $NUMS -eq $EXPECTED ] ||
+		error "\"$CMD\" wrong: found $NUMS, expected $EXPECTED"
 }
 run_test 56q "check lfs find -gid and ! -gid ==============================="
 
 test_56r() {
+	TDIR=$DIR/${tdir}r
 	setup_56 $NUMFILES $NUMDIRS
-	TDIR=$DIR/${tdir}g
 
 	EXPECTED=12
-	NUMS=`$LFIND -size 0 -t f $TDIR | wc -l`
-	[ $NUMS -eq $EXPECTED ] || \
-		error "lfs find $TDIR -size 0 wrong: found $NUMS, expected $EXPECTED"
+	CMD="$LFIND -size 0 -type f $TDIR"
+	NUMS=$($CMD | wc -l)
+	[ $NUMS -eq $EXPECTED ] ||
+		error "\"$CMD\" wrong: found $NUMS, expected $EXPECTED"
 	EXPECTED=0
-	NUMS=`$LFIND ! -size 0 -t f $TDIR | wc -l`
-	[ $NUMS -eq $EXPECTED ] || \
-		error "lfs find $TDIR ! -size 0 wrong: found $NUMS, expected $EXPECTED"
-	echo "test" > $TDIR/56r && sync
-	echo "test2" > $TDIR/56r2 && sync
+	CMD="$LFIND ! -size 0 -type f $TDIR"
+	NUMS=$($CMD | wc -l)
+	[ $NUMS -eq $EXPECTED ] ||
+		error "\"$CMD\" wrong: found $NUMS, expected $EXPECTED"
+	echo "test" > $TDIR/$tfile
+	echo "test2" > $TDIR/$tfile.2 && sync
 	EXPECTED=1
-	NUMS=`$LFIND -size 5 -t f $TDIR | wc -l`
-	[ $NUMS -eq $EXPECTED ] || \
-		error "lfs find $TDIR -size 5 wrong: found $NUMS, expected $EXPECTED"
+	CMD="$LFIND -size 5 -type f $TDIR"
+	NUMS=$($CMD | wc -l)
+	[ $NUMS -eq $EXPECTED ] ||
+		error "\"$CMD\" wrong: found $NUMS, expected $EXPECTED"
 	EXPECTED=1
-	NUMS=`$LFIND -size +5 -t f $TDIR | wc -l`
-	[ $NUMS -eq $EXPECTED ] || \
-		error "lfs find $TDIR -size +5 wrong: found $NUMS, expected $EXPECTED"
+	CMD="$LFIND -size +5 -type f $TDIR"
+	NUMS=$($CMD | wc -l)
+	[ $NUMS -eq $EXPECTED ] ||
+		error "\"$CMD\" wrong: found $NUMS, expected $EXPECTED"
 	EXPECTED=2
-	NUMS=`$LFIND -size +0 -t f $TDIR | wc -l`
-	[ $NUMS -eq $EXPECTED ] || \
-		error "lfs find $TDIR -size +0 wrong: found $NUMS, expected $EXPECTED"
+	CMD="$LFIND -size +0 -type f $TDIR"
+	NUMS=$($CMD | wc -l)
+	[ $NUMS -eq $EXPECTED ] ||
+		error "\"$CMD\" wrong: found $NUMS, expected $EXPECTED"
 	EXPECTED=2
-	NUMS=`$LFIND ! -size -5 -t f $TDIR | wc -l`
-	[ $NUMS -eq $EXPECTED ] || \
-		error "lfs find $TDIR ! -size -5 wrong: found $NUMS, expected $EXPECTED"
+	CMD="$LFIND ! -size -5 -type f $TDIR"
+	NUMS=$($CMD | wc -l)
+	[ $NUMS -eq $EXPECTED ] ||
+		error "\"$CMD\" wrong: found $NUMS, expected $EXPECTED"
 	EXPECTED=12
-	NUMS=`$LFIND -size -5 -t f $TDIR | wc -l`
-	[ $NUMS -eq $EXPECTED ] || \
-		error "lfs find $TDIR -size -5 wrong: found $NUMS, expected $EXPECTED"
+	CMD="$LFIND -size -5 -type f $TDIR"
+	NUMS=$($CMD | wc -l)
+	[ $NUMS -eq $EXPECTED ] ||
+		error "\"$CMD\" wrong: found $NUMS, expected $EXPECTED"
 }
-
 run_test 56r "check lfs find -size works =========================="
 
+test_56s() { # LU-611
+	TDIR=$DIR/${tdir}s
+	setup_56 $NUMFILES $NUMDIRS "-c $OSTCOUNT"
+
+	if [ $OSTCOUNT -gt 1 ]; then
+		$SETSTRIPE -c 1 $TDIR/$tfile.{0,1,2,3}
+		ONESTRIPE=4
+		EXTRA=4
+	else
+		ONESTRIPE=$(((NUMDIRS + 1) * NUMFILES))
+		EXTRA=0
+	fi
+
+	EXPECTED=$(((NUMDIRS + 1) * NUMFILES))
+	CMD="$LFIND -stripe-count $OSTCOUNT -type f $TDIR"
+	NUMS=$($CMD | wc -l)
+	[ $NUMS -eq $EXPECTED ] ||
+		error "\"$CMD\" wrong: found $NUMS, expected $EXPECTED"
+
+	EXPECTED=$(((NUMDIRS + 1) * NUMFILES + EXTRA))
+	CMD="$LFIND -stripe-count +0 -type f $TDIR"
+	NUMS=$($CMD | wc -l)
+	[ $NUMS -eq $EXPECTED ] ||
+		error "\"$CMD\" wrong: found $NUMS, expected $EXPECTED"
+
+	EXPECTED=$ONESTRIPE
+	CMD="$LFIND -stripe-count 1 -type f $TDIR"
+	NUMS=$($CMD | wc -l)
+	[ $NUMS -eq $EXPECTED ] ||
+		error "\"$CMD\" wrong: found $NUMS, expected $EXPECTED"
+
+	CMD="$LFIND -stripe-count -2 -type f $TDIR"
+	NUMS=$($CMD | wc -l)
+	[ $NUMS -eq $EXPECTED ] ||
+		error "\"$CMD\" wrong: found $NUMS, expected $EXPECTED"
+
+	EXPECTED=0
+	CMD="$LFIND -stripe-count $((OSTCOUNT + 1)) -type f $TDIR"
+	NUMS=$($CMD | wc -l)
+	[ $NUMS -eq $EXPECTED ] ||
+		error "\"$CMD\" wrong: found $NUMS, expected $EXPECTED"
+}
+run_test 56s "check lfs find -stripe-count works"
+
+test_56t() { # LU-611
+	TDIR=$DIR/${tdir}t
+	setup_56 $NUMFILES $NUMDIRS "-s 512k"
+
+	$SETSTRIPE -S 256k $TDIR/$tfile.{0,1,2,3}
+
+	EXPECTED=$(((NUMDIRS + 1) * NUMFILES))
+	CMD="$LFIND -stripe-size 512k -type f $TDIR"
+	NUMS=$($CMD | wc -l)
+	[ $NUMS -eq $EXPECTED ] ||
+		error "\"$CMD\" wrong: found $NUMS, expected $EXPECTED"
+
+	CMD="$LFIND -stripe-size +320k -type f $TDIR"
+	NUMS=$($CMD | wc -l)
+	[ $NUMS -eq $EXPECTED ] ||
+		error "\"$CMD\" wrong: found $NUMS, expected $EXPECTED"
+
+	EXPECTED=$(((NUMDIRS + 1) * NUMFILES + 4))
+	CMD="$LFIND -stripe-size +200k -type f $TDIR"
+	NUMS=$($CMD | wc -l)
+	[ $NUMS -eq $EXPECTED ] ||
+		error "\"$CMD\" wrong: found $NUMS, expected $EXPECTED"
+
+	CMD="$LFIND -stripe-size -640k -type f $TDIR"
+	NUMS=$($CMD | wc -l)
+	[ $NUMS -eq $EXPECTED ] ||
+		error "\"$CMD\" wrong: found $NUMS, expected $EXPECTED"
+
+	EXPECTED=4
+	CMD="$LFIND -stripe-size 256k -type f $TDIR"
+	NUMS=$($CMD | wc -l)
+	[ $NUMS -eq $EXPECTED ] ||
+		error "\"$CMD\" wrong: found $NUMS, expected $EXPECTED"
+
+	CMD="$LFIND -stripe-size -320k -type f $TDIR"
+	NUMS=$($CMD | wc -l)
+	[ $NUMS -eq $EXPECTED ] ||
+		error "\"$CMD\" wrong: found $NUMS, expected $EXPECTED"
+
+	EXPECTED=0
+	CMD="$LFIND -stripe-size 1024k -type f $TDIR"
+	NUMS=$($CMD | wc -l)
+	[ $NUMS -eq $EXPECTED ] ||
+		error "\"$CMD\" wrong: found $NUMS, expected $EXPECTED"
+}
+run_test 56t "check lfs find -stripe-size works"
+
+test_56u() { # LU-611
+	TDIR=$DIR/${tdir}u
+	setup_56 $NUMFILES $NUMDIRS "-i 0"
+
+	if [ $OSTCOUNT -gt 1 ]; then
+		$SETSTRIPE -i 1 $TDIR/$tfile.{0,1,2,3}
+		ONESTRIPE=4
+	else
+		ONESTRIPE=0
+	fi
+
+	EXPECTED=$(((NUMDIRS + 1) * NUMFILES))
+	CMD="$LFIND -stripe-index 0 -type f $TDIR"
+	NUMS=$($CMD | wc -l)
+	[ $NUMS -eq $EXPECTED ] ||
+		error "\"$CMD\" wrong: found $NUMS, expected $EXPECTED"
+
+	EXPECTED=$ONESTRIPE
+	CMD="$LFIND -stripe-index 1 -type f $TDIR"
+	NUMS=$($CMD | wc -l)
+	[ $NUMS -eq $EXPECTED ] ||
+		error "\"$CMD\" wrong: found $NUMS, expected $EXPECTED"
+
+	CMD="$LFIND ! -stripe-index 0 -type f $TDIR"
+	NUMS=$($CMD | wc -l)
+	[ $NUMS -eq $EXPECTED ] ||
+		error "\"$CMD\" wrong: found $NUMS, expected $EXPECTED"
+
+	EXPECTED=0
+	# This should produce an error and not return any files
+	CMD="$LFIND -stripe-index $OSTCOUNT -type f $TDIR"
+	NUMS=$($CMD 2>/dev/null | wc -l)
+	[ $NUMS -eq $EXPECTED ] ||
+		error "\"$CMD\" wrong: found $NUMS, expected $EXPECTED"
+
+	EXPECTED=$(((NUMDIRS + 1) * NUMFILES + ONESTRIPE))
+	CMD="$LFIND -stripe-index 0,1 -type f $TDIR"
+	NUMS=$($CMD | wc -l)
+	[ $NUMS -eq $EXPECTED ] ||
+		error "\"$CMD\" wrong: found $NUMS, expected $EXPECTED"
+}
+run_test 56u "check lfs find -stripe-index works"
+
 test_56v() {
-    local FIND_MDT_IDX=0
+    local MDT_IDX=0
 
-    TDIR=${tdir}g
+    TDIR=$DIR/${tdir}v
     rm -rf $TDIR
     setup_56 $NUMFILES $NUMDIRS
 
-    UUID=$(mdtuuid_from_index $FIND_MDT_IDX $DIR/$TDIR)
-    for file in $($LFIND -mdt $UUID $DIR/$TDIR); do
+    UUID=$(mdtuuid_from_index $MDT_IDX $TDIR)
+    [ -z "$UUID" ] && error "mdtuuid_from_index cannot find MDT index $MDT_IDX"
+
+    for file in $($LFIND -mdt $UUID $TDIR); do
         file_mdt_idx=$($GETSTRIPE -M $file)
-        [ $file_mdt_idx -eq $FIND_MDT_IDX ] ||
-            error "wrong lfind -m not match getstripe -M"
+        [ $file_mdt_idx -eq $MDT_IDX ] ||
+            error "'lfind -mdt $UUID' != 'getstripe -M' ($file_mdt_idx)"
     done
 }
 run_test 56v "check 'lfs find -mdt match with lfs getstripe -M' ======="
 
+# Get and check the actual stripe count of one file.
+# Usage: check_stripe_count <file> <expected_stripe_count>
+check_stripe_count() {
+    local file=$1
+    local expected=$2
+    local actual
+
+    [[ -z "$file" || -z "$expected" ]] &&
+        error "check_stripe_count: invalid argument!"
+
+    local cmd="$GETSTRIPE -c $file"
+    actual=$($cmd) || error "$cmd failed"
+    actual=${actual%% *}
+
+    if [[ $actual -ne $expected ]]; then
+        [[ $expected -eq -1 ]] ||
+            error "$cmd wrong: found $actual, expected $expected"
+        [[ $actual -eq $OSTCOUNT ]] ||
+            error "$cmd wrong: found $actual, expected $OSTCOUNT"
+    fi
+}
+
+test_56w() {
+    TDIR=$DIR/${tdir}w
+
+    rm -rf $TDIR || error "remove $TDIR failed"
+    setup_56 $NUMFILES $NUMDIRS "-c $OSTCOUNT"
+
+    local stripe_size
+    stripe_size=$($GETSTRIPE -S -d $TDIR) ||
+        error "$GETSTRIPE -S -d $TDIR failed"
+    stripe_size=${stripe_size%% *}
+
+    local file_size=$((stripe_size * OSTCOUNT))
+    local file_num=$((NUMDIRS * NUMFILES + NUMFILES))
+    local required_space=$((file_num * file_size))
+    local free_space=$($LCTL get_param -n lov.$LOVNAME.kbytesavail)
+    [[ $free_space -le $((required_space / 1024)) ]] &&
+        skip_env "need at least $required_space bytes free space," \
+                 "have $free_space kbytes" && return
+
+    local dd_bs=65536
+    local dd_count=$((file_size / dd_bs))
+
+    # write data into the files
+    local i
+    local j
+    local file
+    for i in $(seq 1 $NUMFILES); do
+        file=$TDIR/file$i
+        yes | dd bs=$dd_bs count=$dd_count of=$file >/dev/null 2>&1 ||
+            error "write data into $file failed"
+    done
+    for i in $(seq 1 $NUMDIRS); do
+        for j in $(seq 1 $NUMFILES); do
+            file=$TDIR/dir$i/file$j
+            yes | dd bs=$dd_bs count=$dd_count of=$file \
+                >/dev/null 2>&1 ||
+                error "write data into $file failed"
+        done
+    done
+
+    local expected=-1
+    [[ $OSTCOUNT -gt 1 ]] && expected=$((OSTCOUNT - 1))
+
+    # lfs_migrate file
+    local cmd="$LFS_MIGRATE -y -c $expected $TDIR/file1"
+    echo "$cmd"
+    eval $cmd || error "$cmd failed"
+
+    check_stripe_count $TDIR/file1 $expected
+
+    # lfs_migrate dir
+    cmd="$LFS_MIGRATE -y -c $expected $TDIR/dir1"
+    echo "$cmd"
+    eval $cmd || error "$cmd failed"
+
+    for j in $(seq 1 $NUMFILES); do
+        check_stripe_count $TDIR/dir1/file$j $expected
+    done
+
+    # lfs_migrate works with lfs find
+    cmd="$LFIND -stripe_count $OSTCOUNT -type f $TDIR |
+         $LFS_MIGRATE -y -c $expected"
+    echo "$cmd"
+    eval $cmd || error "$cmd failed"
+
+    for i in $(seq 2 $NUMFILES); do
+        check_stripe_count $TDIR/file$i $expected
+    done
+    for i in $(seq 2 $NUMDIRS); do
+        for j in $(seq 1 $NUMFILES); do
+            check_stripe_count $TDIR/dir$i/file$j $expected
+        done
+    done
+}
+run_test 56w "check lfs_migrate -c stripe_count works"
+
 test_57a() {
 	# 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)
 	[ -z "$DEV" ] && error "can't access $MNTDEV"
 	for DEV in $(do_facet $SINGLEMDS lctl get_param -n $MNTDEV); do
-		do_facet $SINGLEMDS $DUMPE2FS -h $DEV > $TMP/t57a.dump || error "can't access $DEV"
+		do_facet $SINGLEMDS $DUMPE2FS -h $DEV > $TMP/t57a.dump ||
+			error "can't access $DEV"
 		DEVISIZE=`awk '/Inode size:/ { print $3 }' $TMP/t57a.dump`
 		[ "$DEVISIZE" -gt 128 ] || error "inode size $DEVISIZE"
 		rm $TMP/t57a.dump
@@ -3582,6 +4250,11 @@ test_57a() {
 run_test 57a "verify MDS filesystem created with large inodes =="
 
 test_57b() {
+	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
 
@@ -3590,7 +4263,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
 
@@ -3647,8 +4320,8 @@ test_59() {
 	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 ========="
 
@@ -3712,7 +4385,7 @@ test_61() {
 	f="$DIR/f61"
 	dd if=/dev/zero of=$f bs=`page_size` count=1
 	cancel_lru_locks osc
-	multiop $f OSMWUc || error
+	$MULTIOP $f OSMWUc || error
 	sync
 }
 run_test 61 "mmap() writes don't make sync hang ================"
@@ -3758,7 +4431,7 @@ test_63b() {
 
 	#define OBD_FAIL_OSC_BRW_PREP_REQ        0x406
 	lctl set_param fail_loc=0x80000406
-	multiop $DIR/$tfile Owy && \
+	$MULTIOP $DIR/$tfile Owy && \
 		error "sync didn't return ENOMEM"
 	sync; sleep 2; sync	# do a real sync this time to flush page
 	lctl get_param -n llite.*.dump_page_cache | grep locked && \
@@ -3774,105 +4447,115 @@ test_64a () {
 run_test 64a "verify filter grant calculations (in kernel) ====="
 
 test_64b () {
-        [ ! -f oos.sh ] && skip_env "missing subtest oos.sh" && 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"
+	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 $DIR/d65 -s $(($STRIPESIZE * 2)) -i 0 -c 1 || error "setstripe"
-	touch $DIR/d65/f2
-	$LVERIFY $DIR/d65 $DIR/d65/f2 || error "lverify failed"
+	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 $(($STRIPESIZE * 2)) 0 1 ==============="
+run_test 65b "directory setstripe -S $((STRIPESIZE * 2)) -i 0 -c 1"
 
 test_65c() {
 	if [ $OSTCOUNT -gt 1 ]; then
-		mkdir -p $DIR/d65
-    		$SETSTRIPE $DIR/d65 -s $(($STRIPESIZE * 4)) -i 1 \
-			-c $(($OSTCOUNT - 1)) || error "setstripe"
-		touch $DIR/d65/f3
-		$LVERIFY $DIR/d65 $DIR/d65/f3 || error "lverify failed"
+		test_mkdir -p $DIR/$tdir
+		$SETSTRIPE -S $(($STRIPESIZE * 4)) -i 1 \
+			-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 $(($STRIPESIZE * 4)) 1 $(($OSTCOUNT - 1))"
+run_test 65c "directory setstripe -S $((STRIPESIZE*4)) -i 1 -c $((OSTCOUNT-1))"
 
 test_65d() {
-	mkdir -p $DIR/d65
+	test_mkdir -p $DIR/$tdir
 	if [ $STRIPECOUNT -le 0 ]; then
-        	sc=1
+		sc=1
 	elif [ $STRIPECOUNT -gt 2000 ]; then
 #LOV_MAX_STRIPE_COUNT is 2000
 		[ $OSTCOUNT -gt 2000 ] && sc=2000 || sc=$(($OSTCOUNT - 1))
 	else
-        	sc=$(($STRIPECOUNT - 1))
+		sc=$(($STRIPECOUNT - 1))
 	fi
-	$SETSTRIPE $DIR/d65 -s $STRIPESIZE -c $sc || 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 $STRIPESIZE -1 stripe_count =============="
+run_test 65d "directory setstripe -S $STRIPESIZE -c stripe_count"
 
 test_65e() {
-	mkdir -p $DIR/d65
+	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
+	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 $DIR/d65 -s $(($STRIPESIZE * 2)) -i 0 -c 1 || error "setstripe"
-        $SETSTRIPE -d $DIR/d65 || error "setstripe"
-        $GETSTRIPE -v $DIR/d65 | grep "Default" || \
+        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 $DIR/d65 -s $(($STRIPESIZE * 2)) -i 0 -c 1 || error "setstripe"
-        mkdir -p $DIR/d65/dd1
-        [ "`$GETSTRIPE -v $DIR/d65 | grep "^count"`" == \
-          "`$GETSTRIPE -v $DIR/d65/dd1 | grep "^count"`" ] || error "stripe info inherit failed"
+        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
-        $SETSTRIPE $MOUNT -s 65536 -c -1
+        $SETSTRIPE -S 65536 -c -1 $MOUNT
 }
 run_test 65i "set non-default striping on root directory (bug 6367)="
 
 test_65ia() { # bug12836
-	$LFS getstripe $MOUNT || error "getstripe $MOUNT failed"
+	$GETSTRIPE $MOUNT || error "getstripe $MOUNT failed"
 }
 run_test 65ia "getstripe on -1 default directory striping"
 
 test_65ib() { # bug12836
-	$LFS getstripe -v $MOUNT || error "getstripe -v $MOUNT failed"
+	$GETSTRIPE -v $MOUNT || error "getstripe -v $MOUNT failed"
 }
 run_test 65ib "getstripe -v on -1 default directory striping"
 
 test_65ic() { # bug12836
-	$LFS find -mtime -1 $MOUNT || error "find $MOUNT failed"
+	$LFS find -mtime -1 $MOUNT > /dev/null || error "find $MOUNT failed"
 }
 run_test 65ic "new find on -1 default directory striping"
 
@@ -3888,40 +4571,43 @@ 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
+    [ "$OSTCOUNT" -lt 2 ] && skip_env "too few OSTs" && return
+    remote_mds_nodsh && skip "remote MDS with nodsh" && return
 
-        echo "Check OST status: "
-        MDS_OSCS=`do_facet $SINGLEMDS lctl dl | awk '/[oO][sS][cC].*md[ts]/ { print $4 }'`
-        for OSC in $MDS_OSCS; do
-                echo $OSC "is activate"
-                do_facet $SINGLEMDS lctl --device %$OSC activate
-        done
-        do_facet client mkdir -p $DIR/$tdir
-        for INACTIVE_OSC in $MDS_OSCS; do
-                echo $INACTIVE_OSC "is Deactivate:"
-                do_facet $SINGLEMDS lctl --device  %$INACTIVE_OSC deactivate
-                for STRIPE_OSC in $MDS_OSCS; do
-                        STRIPE_OST=`osc_to_ost $STRIPE_OSC`
-                        STRIPE_INDEX=`do_facet $SINGLEMDS lctl get_param -n lov.*md*.target_obd |
-                                      grep $STRIPE_OST | awk -F: '{print $1}' | head -n 1`
-
-                [ -f $DIR/$tdir/${STRIPE_INDEX} ] && continue
-                        echo "$SETSTRIPE $DIR/$tdir/${STRIPE_INDEX} -i ${STRIPE_INDEX} -c 1"
-                        do_facet client $SETSTRIPE $DIR/$tdir/${STRIPE_INDEX} -i ${STRIPE_INDEX} -c 1
-                        RC=$?
-                        [ $RC -ne 0 ] && error "setstripe should have succeeded"
-                done
-                do_facet client rm -f $DIR/$tdir/*
-                echo $INACTIVE_OSC "is Activate."
-                do_facet $SINGLEMDS lctl --device  %$INACTIVE_OSC activate
+    echo "Check OST status: "
+    local MDS_OSCS=`do_facet $SINGLEMDS lctl dl |
+              awk '/[oO][sS][cC].*md[ts]/ { print $4 }'`
+
+    for OSC in $MDS_OSCS; do
+        echo $OSC "is activate"
+        do_facet $SINGLEMDS lctl --device %$OSC activate
+    done
+
+    mkdir -p $DIR/$tdir
+    for INACTIVE_OSC in $MDS_OSCS; do
+        echo "Deactivate: " $INACTIVE_OSC
+        do_facet $SINGLEMDS lctl --device %$INACTIVE_OSC deactivate
+        for STRIPE_OSC in $MDS_OSCS; do
+            OST=`osc_to_ost $STRIPE_OSC`
+            IDX=`do_facet $SINGLEMDS lctl get_param -n lov.*md*.target_obd |
+                 awk -F: /$OST/'{ print $1 }' | head -n 1`
+
+            [ -f $DIR/$tdir/$IDX ] && continue
+            echo "$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
+        rm -f $DIR/$tdir/*
+        echo $INACTIVE_OSC "is Activate."
+        do_facet $SINGLEMDS lctl --device  %$INACTIVE_OSC activate
+    done
 }
 run_test 65k "validate manual striping works properly with deactivated OSCs"
 
 test_65l() { # bug 12836
-	mkdir -p $DIR/$tdir/test_dir
-	$SETSTRIPE $DIR/$tdir/test_dir -c -1
+	test_mkdir -p $DIR/$tdir/test_dir
+	$SETSTRIPE -c -1 $DIR/$tdir/test_dir
 	$LFS find -mtime -1 $DIR/$tdir >/dev/null
 }
 run_test 65l "lfs find on -1 stripe dir ========================"
@@ -3930,7 +4616,8 @@ run_test 65l "lfs find on -1 stripe dir ========================"
 test_66() {
 	COUNT=${COUNT:-8}
 	dd if=/dev/zero of=$DIR/f66 bs=1k count=$COUNT
-	sync; sleep 1; sync
+	sync; sync_all_data; sync; sync_all_data
+	cancel_lru_locks osc
 	BLOCKS=`ls -s $DIR/f66 | awk '{ print $1 }'`
 	[ $BLOCKS -ge $COUNT ] || error "$DIR/f66 blocks $BLOCKS < $COUNT"
 }
@@ -4036,7 +4723,7 @@ test_69() {
 	remote_ost_nodsh && skip "remote OST with nodsh" && return
 
 	f="$DIR/$tfile"
-	$SETSTRIPE $f -c 1 -i 0
+	$SETSTRIPE -c 1 -i 0 $f
 
 	$DIRECTIO write ${f}.2 0 1 || error "directio write error"
 
@@ -4059,7 +4746,7 @@ 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) ===="
@@ -4084,7 +4771,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) ===="
@@ -4103,7 +4789,8 @@ test_72b() { # bug 24226 -- keep mode setting when size is not changing
 		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
@@ -4119,17 +4806,17 @@ 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
+	test_mkdir $DIR/d73-1
+	test_mkdir $DIR/d73-2
 	multiop_bg_pause $DIR/d73-1/f73-1 O_c || return 1
 	pid1=$!
 
 	lctl set_param fail_loc=0x80000129
-	multiop $DIR/d73-1/f73-2 Oc &
+	$MULTIOP $DIR/d73-1/f73-2 Oc &
 	sleep 1
 	lctl set_param fail_loc=0
 
-	multiop $DIR/d73-2/f73-3 Oc &
+	$MULTIOP $DIR/d73-2/f73-3 Oc &
 	pid3=$!
 
 	kill -USR1 $pid1
@@ -4349,7 +5036,7 @@ test_77g() { # bug 10889
 
 	[ ! -f $F77_TMP ] && setup_f77
 
-	$SETSTRIPE $DIR/f77g -c 1 -i 0
+	$SETSTRIPE -c 1 -i 0 $DIR/f77g
 	#define OBD_FAIL_OST_CHECKSUM_RECEIVE       0x21a
 	do_facet ost1 lctl set_param fail_loc=0x8000021a
 	set_checksums 1
@@ -4384,7 +5071,7 @@ test_77i() { # bug 13805
 	for VALUE in `lctl get_param osc.*osc-[^mM]*.checksum_type`; do
 		PARAM=`echo ${VALUE[0]} | cut -d "=" -f1`
 		algo=`lctl get_param -n $PARAM | sed 's/.*\[\(.*\)\].*/\1/g'`
-		[ "$algo" = "crc32" ] || error "algo set to $algo instead of crc32"
+		[ "$algo" = "adler" ] || error "algo set to $algo instead of adler"
 	done
 	remount_client $MOUNT
 }
@@ -4440,7 +5127,7 @@ test_78() { # bug 10901
 
 	[ "$SLOW" = "no" ] && NSEQ=1 && [ $F78SIZE -gt 32 ] && F78SIZE=32
 	echo "File size: $F78SIZE"
-	$SETSTRIPE $DIR/$tfile -c $OSTCOUNT || error "setstripe failed"
+	$SETSTRIPE -c $OSTCOUNT $DIR/$tfile || error "setstripe failed"
  	for i in `seq 1 $NSEQ`
  	do
  		FSIZE=$(($F78SIZE / ($NSEQ - $i + 1)))
@@ -4483,6 +5170,16 @@ test_79() { # bug 12743
 run_test 79 "df report consistency check ======================="
 
 test_80() { # bug 10718
+        # 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`
@@ -4492,7 +5189,9 @@ 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  ===="
@@ -4501,11 +5200,11 @@ test_81a() { # LU-456
         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
-        multiop $DIR/$tfile oO_CREAT:O_RDWR:O_SYNC:w4096c
+        $MULTIOP $DIR/$tfile oO_CREAT:O_RDWR:O_SYNC:w4096c
         RC=$?
         if [ $RC -ne 0 ] ; then
                 error "write should success, but failed for $RC"
@@ -4517,11 +5216,11 @@ test_81b() { # LU-456
         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
-        multiop $DIR/$tfile oO_CREAT:O_RDWR:O_SYNC:w4096c
+        $MULTIOP $DIR/$tfile oO_CREAT:O_RDWR:O_SYNC:w4096c
         RC=$?
         ENOSPC=28
         if [ $RC -ne $ENOSPC ] ; then
@@ -4530,11 +5229,32 @@ test_81b() { # LU-456
 }
 run_test 81b "OST should return -ENOSPC when retry still fails ======="
 
+test_82() { # LU-1031
+	dd if=/dev/zero of=$DIR/$tfile bs=1M count=10
+	local gid1=14091995
+	local gid2=16022000
+
+	multiop_bg_pause $DIR/$tfile OG${gid1}_g${gid1}c || return 1
+	local MULTIPID1=$!
+	multiop_bg_pause $DIR/$tfile O_G${gid2}r10g${gid2}c || return 2
+	local MULTIPID2=$!
+	kill -USR1 $MULTIPID2
+	sleep 2
+	if [[ `ps h -o comm -p $MULTIPID2` == "" ]]; then
+		error "First grouplock does not block second one"
+	else
+		echo "Second grouplock blocks first one"
+	fi
+	kill -USR1 $MULTIPID1
+	wait $MULTIPID1
+	wait $MULTIPID2
+}
+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
@@ -4561,7 +5281,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
 }
@@ -4629,30 +5349,30 @@ function get_named_value()
         line=$REPLY
         case $line in
         $tag*)
-            echo $line | sed "s/^$tag//"
+            echo $line | sed "s/^$tag[ ]*//"
             break
             ;;
         esac
     done
 }
 
-export CACHE_MAX=`lctl get_param -n llite.*.max_cached_mb | head -n 1`
-cleanup_101() {
-	lctl set_param -n llite.*.max_cached_mb $CACHE_MAX
+export CACHE_MAX=`$LCTL get_param -n llite.*.max_cached_mb | head -n 1`
+cleanup_101a() {
+	$LCTL set_param -n llite.*.max_cached_mb $CACHE_MAX
 	trap 0
 }
 
-test_101() {
+test_101a() {
 	local s
 	local discard
 	local nreads=10000
 	[ "$CPU" = "UML" ] && nreads=1000
 	local cache_limit=32
 
-	lctl set_param -n osc.*-osc*.rpc_stats 0
-	trap cleanup_101 EXIT
-	lctl set_param -n llite.*.read_ahead_stats 0
-	lctl set_param -n llite.*.max_cached_mb $cache_limit
+	$LCTL set_param -n osc.*-osc*.rpc_stats 0
+	trap cleanup_101a EXIT
+	$LCTL set_param -n llite.*.read_ahead_stats 0
+	$LCTL set_param -n llite.*.max_cached_mb $cache_limit
 
 	#
 	# randomly read 10000 of 64K chunks from file 3x 32MB in size
@@ -4661,38 +5381,46 @@ test_101() {
 	$READS -f $DIR/$tfile -s$((cache_limit * 3192 * 1024)) -b65536 -C -n$nreads -t 180
 
 	discard=0
-        for s in `lctl get_param -n llite.*.read_ahead_stats | \
+        for s in `$LCTL get_param -n llite.*.read_ahead_stats | \
 		get_named_value 'read but discarded' | cut -d" " -f1`; do
 			discard=$(($discard + $s))
 	done
-	cleanup_101
+	cleanup_101a
 
 	if [ $(($discard * 10)) -gt $nreads ] ;then
-		lctl get_param osc.*-osc*.rpc_stats
-		lctl get_param llite.*.read_ahead_stats
+		$LCTL get_param osc.*-osc*.rpc_stats
+		$LCTL get_param llite.*.read_ahead_stats
 		error "too many ($discard) discarded pages"
 	fi
 	rm -f $DIR/$tfile || true
 }
-run_test 101 "check read-ahead for random reads ================"
+run_test 101a "check read-ahead for random reads ================"
 
-setup_test101b() {
-	mkdir -p $DIR/$tdir
+setup_test101bc() {
+	test_mkdir -p $DIR/$tdir
 	STRIPE_SIZE=1048576
 	STRIPE_COUNT=$OSTCOUNT
 	STRIPE_OFFSET=0
 
-	trap cleanup_test101b EXIT
+	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
+
+	trap cleanup_test101bc EXIT
 	# prepare the read-ahead file
-	$SETSTRIPE $DIR/$tfile -s $STRIPE_SIZE -i $STRIPE_OFFSET -c $OSTCOUNT
+	$SETSTRIPE -S $STRIPE_SIZE -i $STRIPE_OFFSET -c $OSTCOUNT $DIR/$tfile
 
 	dd if=/dev/zero of=$DIR/$tfile bs=1024k count=100 2> /dev/null
 }
 
-cleanup_test101b() {
+cleanup_test101bc() {
 	trap 0
 	rm -rf $DIR/$tdir
 	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
 }
 
 calc_total() {
@@ -4710,9 +5438,8 @@ ra_check_101() {
 	DISCARD=`$LCTL get_param -n llite.*.read_ahead_stats | \
 			get_named_value 'read but discarded' | \
 			cut -d" " -f1 | calc_total`
-
 	if [ $DISCARD -gt $discard_limit ]; then
-		lctl get_param llite.*.read_ahead_stats
+		$LCTL get_param llite.*.read_ahead_stats
 		error "Too many ($DISCARD) discarded pages with size (${READ_SIZE})"
 	else
 		echo "Read-ahead success for size ${READ_SIZE}"
@@ -4726,7 +5453,7 @@ test_101b() {
 	local FILE_LENGTH=$((STRIPE_SIZE*100))
 	local ITERATION=$((FILE_LENGTH/STRIDE_SIZE))
 	# prepare the read-ahead file
-	setup_test101b
+	setup_test101bc
 	cancel_lru_locks osc
 	for BIDX in 2 4 8 16 32 64 128 256
 	do
@@ -4740,14 +5467,55 @@ test_101b() {
 		cancel_lru_locks osc
 		ra_check_101 $BSIZE
 	done
-	cleanup_test101b
+	cleanup_test101bc
 	true
 }
 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
+
+    setup_test101bc
+
+    cancel_lru_locks osc
+    $LCTL set_param osc.*.rpc_stats 0
+    $READS -f $DIR/$tfile -s$FILE_LENGTH -b65536 -n$nreads -t 180
+    for osc in $($LCTL get_param -N osc.*); do
+        if [ "$osc" == "osc.num_refs" ]; then
+            continue
+        fi
+
+        local lines=$($LCTL get_param -n ${osc}.rpc_stats | wc | awk '{print $1}')
+        if [ $lines -le 20 ]; then
+            continue
+        fi
+
+        local rpc4k=$($LCTL get_param -n ${osc}.rpc_stats |
+                                     awk '$1 == "1:" { print $2; exit; }')
+        local rpc8k=$($LCTL get_param -n ${osc}.rpc_stats |
+                                     awk '$1 == "2:" { print $2; exit; }')
+        local rpc16k=$($LCTL get_param -n ${osc}.rpc_stats |
+                                     awk '$1 == "4:" { print $2; exit; }')
+        local rpc32k=$($LCTL get_param -n ${osc}.rpc_stats |
+                                     awk '$1 == "8:" { print $2; exit; }')
+
+        [ $rpc4k != 0 ]  && error "Small 4k read IO ${rpc4k}!"
+        [ $rpc8k != 0 ]  && error "Small 8k read IO ${rpc8k}!"
+        [ $rpc16k != 0 ] && error "Small 16k read IO ${rpc16k}!"
+        [ $rpc32k != 0 ] && error "Small 32k read IO ${rpc32k}!"
+        echo "${osc} rpc check passed!"
+    done
+    cleanup_test101bc
+    true
+}
+run_test 101c "check stripe_size aligned read-ahead ================="
+
 set_read_ahead() {
-   lctl get_param -n llite.*.max_read_ahead_mb | head -n 1
-   lctl set_param -n llite.*.max_read_ahead_mb $1 > /dev/null 2>&1
+   $LCTL get_param -n llite.*.max_read_ahead_mb | head -n 1
+   $LCTL set_param -n llite.*.max_read_ahead_mb $1 > /dev/null 2>&1
 }
 
 test_101d() {
@@ -4755,12 +5523,12 @@ test_101d() {
     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
 
@@ -4781,8 +5549,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
@@ -4790,8 +5559,81 @@ test_101d() {
 }
 run_test 101d "file read with and without read-ahead enabled  ================="
 
+test_101e() {
+    local file=$DIR/$tfile
+    local size=500  #KB
+    local count=100
+    local blksize=1024
+
+    local space=$(df -P $DIR | tail -n 1 | awk '{ print $4 }')
+    local need_space=$((count * size))
+    [ $space -gt $need_space ] ||
+        { skip_env "Need free space $need_space, have $space" && return; }
+
+    echo Creating $count ${size}K test files
+    for ((i = 0; i < $count; i++)); do
+        dd if=/dev/zero of=${file}_${i} bs=$blksize count=$size 2>/dev/null
+    done
+
+    echo Cancel LRU locks on lustre client to flush the client cache
+    cancel_lru_locks osc
+
+    echo Reset readahead stats
+    $LCTL set_param -n llite.*.read_ahead_stats 0
+
+    for ((i = 0; i < $count; i++)); do
+        dd if=${file}_${i} of=/dev/null bs=$blksize count=$size 2>/dev/null
+    done
+
+    local miss=$($LCTL get_param -n llite.*.read_ahead_stats | \
+          get_named_value 'misses' | cut -d" " -f1 | calc_total)
+
+    for ((i = 0; i < $count; i++)); do
+        rm -rf ${file}_${i} 2>/dev/null
+    done
+
+    #10000 means 20% reads are missing in readahead
+    [ $miss -lt 10000 ] ||  error "misses too much for small reads"
+}
+run_test 101e "check read-ahead for small read(1k) for small files(500k)"
+
+cleanup_test101f() {
+    trap 0
+    $LCTL set_param -n llite.*.max_read_ahead_whole_mb $MAX_WHOLE_MB
+    rm -rf $DIR/$tfile 2>/dev/null
+}
+
+test_101f() {
+    local file=$DIR/$tfile
+    local nreads=1000
+
+    MAX_WHOLE_MB=$($LCTL get_param -n llite.*.max_read_ahead_whole_mb)
+    $LCTL set_param -n llite.*.max_read_ahead_whole_mb 2
+    dd if=/dev/zero of=${file} bs=2097152 count=1 2>/dev/null
+    trap cleanup_test101f EXIT
+
+    echo Cancel LRU locks on lustre client to flush the client cache
+    cancel_lru_locks osc
+
+    echo Reset readahead stats
+    $LCTL set_param -n llite.*.read_ahead_stats 0
+    # Random read in a 2M file, because max_read_ahead_whole_mb = 2M,
+    # readahead should read in 2M file on second read, so only miss
+    # 2 pages.
+    echo Random 4K reads on 2M file for 1000 times
+    $READS -f $file -s 2097152 -b 4096 -n $nreads
+
+    echo checking missing pages
+    local miss=$($LCTL get_param -n llite.*.read_ahead_stats |
+          get_named_value 'misses' | cut -d" " -f1 | calc_total)
+
+    [ $miss -lt 3 ] || error "misses too much pages!"
+    cleanup_test101f
+}
+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
@@ -4800,17 +5642,14 @@ setup_test102() {
 
 	trap cleanup_test102 EXIT
 	cd $DIR
-	$1 $SETSTRIPE $tdir -s $STRIPE_SIZE -i $STRIPE_OFFSET -c $STRIPE_COUNT
+	$1 $SETSTRIPE -S $STRIPE_SIZE -i $STRIPE_OFFSET -c $STRIPE_COUNT $tdir
 	cd $DIR/$tdir
-	for num in 1 2 3 4
-	do
-		for count in `seq 1 $STRIPE_COUNT`
-		do
-			for offset in `seq 0 $[$STRIPE_COUNT - 1]`
-			do
-				local stripe_size=`expr $STRIPE_SIZE \* $num`
-				local file=file"$num-$offset-$count"
-				$1 $SETSTRIPE $file -s $stripe_size -i $offset -c $count
+	for num in 1 2 3 4; do
+		for count in $(seq 1 $STRIPE_COUNT); do
+			for idx in $(seq 0 $[$STRIPE_COUNT - 1]); do
+				local size=`expr $STRIPE_SIZE \* $num`
+				local file=file"$num-$idx-$count"
+				$1 $SETSTRIPE -S $size -i $idx -c $count $file
 			done
 		done
 	done
@@ -4828,49 +5667,58 @@ cleanup_test102() {
 test_102a() {
 	local testfile=$DIR/xattr_testfile
 
-	rm -f $testfile
-        touch $testfile
+	touch $testfile
 
 	[ "$UID" != 0 ] && skip_env "must run as root" && return
-	[ -z "`lctl get_param -n mdc.*-mdc-*.connect_flags | grep xattr`" ] && skip_env "must have user_xattr" && return
+	[ -z "`lctl get_param -n mdc.*-mdc-*.connect_flags | grep xattr`" ] &&
+		skip_env "must have user_xattr" && return
 
-	[ -z "$(which setfattr 2>/dev/null)" ] && skip_env "could not find setfattr" && return
+	[ -z "$(which setfattr 2>/dev/null)" ] &&
+		skip_env "could not find setfattr" && return
 
 	echo "set/get xattr..."
-        setfattr -n trusted.name1 -v value1 $testfile || error
-        [ "`getfattr -n trusted.name1 $testfile 2> /dev/null | \
-        grep "trusted.name1"`" == "trusted.name1=\"value1\"" ] || error
+	setfattr -n trusted.name1 -v value1 $testfile || error
+	getfattr -n trusted.name1 $testfile 2> /dev/null |
+	  grep "trusted.name1=.value1" ||
+		error "$testfile missing trusted.name1=value1"
 
-        setfattr -n user.author1 -v author1 $testfile || error
-        [ "`getfattr -n user.author1 $testfile 2> /dev/null | \
-        grep "user.author1"`" == "user.author1=\"author1\"" ] || error
+	setfattr -n user.author1 -v author1 $testfile || error
+	getfattr -n user.author1 $testfile 2> /dev/null |
+	  grep "user.author1=.author1" ||
+		error "$testfile missing trusted.author1=author1"
 
 	echo "listxattr..."
-        setfattr -n trusted.name2 -v value2 $testfile || error
-        setfattr -n trusted.name3 -v value3 $testfile || error
-        [ `getfattr -d -m "^trusted" $testfile 2> /dev/null | \
-        grep "trusted.name" | wc -l` -eq 3 ] || error
-
-
-        setfattr -n user.author2 -v author2 $testfile || error
-        setfattr -n user.author3 -v author3 $testfile || error
-        [ `getfattr -d -m "^user" $testfile 2> /dev/null | \
-        grep "user" | wc -l` -eq 3 ] || error
+	setfattr -n trusted.name2 -v value2 $testfile ||
+		error "$testfile unable to set trusted.name2"
+	setfattr -n trusted.name3 -v value3 $testfile ||
+		error "$testfile unable to set trusted.name3"
+	[ $(getfattr -d -m "^trusted" $testfile 2> /dev/null |
+	    grep "trusted.name" | wc -l) -eq 3 ] ||
+		error "$testfile missing 3 trusted.name xattrs"
+
+	setfattr -n user.author2 -v author2 $testfile ||
+		error "$testfile unable to set user.author2"
+	setfattr -n user.author3 -v author3 $testfile ||
+		error "$testfile unable to set user.author3"
+	[ $(getfattr -d -m "^user" $testfile 2> /dev/null |
+	    grep "user.author" | wc -l) -eq 3 ] ||
+		error "$testfile missing 3 user.author xattrs"
 
 	echo "remove xattr..."
-        setfattr -x trusted.name1 $testfile || error
-        getfattr -d -m trusted $testfile 2> /dev/null | \
-        grep "trusted.name1" && error || true
+	setfattr -x trusted.name1 $testfile ||
+		error "$testfile error deleting trusted.name1"
+	getfattr -d -m trusted $testfile 2> /dev/null | grep "trusted.name1" &&
+		error "$testfile did not delete trusted.name1 xattr"
 
-        setfattr -x user.author1 $testfile || error
-        getfattr -d -m user $testfile 2> /dev/null | \
-        grep "user.author1" && error || true
+	setfattr -x user.author1 $testfile ||
+		error "$testfile error deleting user.author1"
+	getfattr -d -m user $testfile 2> /dev/null | grep "user.author1" &&
+		error "$testfile did not delete trusted.name1 xattr"
 
 	# b10667: setting lustre special xattr be silently discarded
 	echo "set lustre special xattr ..."
-	setfattr -n "trusted.lov" -v "invalid value" $testfile || error
-
-	rm -f $testfile
+	setfattr -n "trusted.lov" -v "invalid value" $testfile ||
+		error "$testfile allowed setting trusted.lov"
 }
 run_test 102a "user xattr test =================================="
 
@@ -4879,9 +5727,9 @@ test_102b() {
 	echo "get/set/list trusted.lov xattr ..."
 	[ "$OSTCOUNT" -lt "2" ] && skip_env "skipping 2-stripe test" && return
 	local testfile=$DIR/$tfile
-	$SETSTRIPE -s 65536 -i 1 -c $OSTCOUNT $testfile ||
+	$SETSTRIPE -S 65536 -i 1 -c $OSTCOUNT $testfile ||
 		error "setstripe failed"
-	local STRIPECOUNT=$(lfs getstripe -c $testfile) ||
+	local STRIPECOUNT=$($GETSTRIPE -c $testfile) ||
 		error "getstripe failed"
 	getfattr -d -m "^trusted" $testfile 2> /dev/null | \
 	grep "trusted.lov" || error "can't get trusted.lov from $testfile"
@@ -4892,12 +5740,10 @@ test_102b() {
 
 	$MCREATE $testfile2
 	setfattr -n trusted.lov -v $value $testfile2
-	local tmp_file=${testfile}3
-	$GETSTRIPE -v $testfile2 > $tmp_file
-	local stripe_size=`grep "size"  $tmp_file| awk '{print $2}'`
-	local stripe_count=`grep "count"  $tmp_file| awk '{print $2}'`
-	[ "$stripe_size" -eq 65536 ] || error "stripe size $stripe_size != 65536"
-	[ "$stripe_count" -eq $STRIPECOUNT ] ||
+	local stripe_size=$($GETSTRIPE -S $testfile2)
+	local stripe_count=$($GETSTRIPE -c $testfile2)
+	[ $stripe_size -eq 65536 ] || error "stripe size $stripe_size != 65536"
+	[ $stripe_count -eq $STRIPECOUNT ] ||
 		error "stripe count $stripe_count != $STRIPECOUNT"
 	rm -f $DIR/$tfile
 }
@@ -4907,12 +5753,12 @@ 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 ||
+	$RUNAS $SETSTRIPE -S 65536 -i 1 -c $OSTCOUNT $testfile ||
 		error "setstripe failed"
-	local STRIPECOUNT=$($RUNAS lfs getstripe -c $testfile) ||
+	local STRIPECOUNT=$($RUNAS $GETSTRIPE -c $testfile) ||
 		error "getstripe failed"
 	$RUNAS getfattr -d -m "^lustre" $testfile 2> /dev/null | \
 	grep "lustre.lov" || error "can't get lustre.lov from $testfile"
@@ -4923,10 +5769,8 @@ test_102c() {
 
 	$RUNAS $MCREATE $testfile2
 	$RUNAS setfattr -n lustre.lov -v $value $testfile2
-	local tmp_file=${testfile}3
-	$RUNAS $GETSTRIPE -v $testfile2 > $tmp_file
-	local stripe_size=`grep "size"  $tmp_file| awk '{print $2}'`
-	local stripe_count=`grep "count"  $tmp_file| awk '{print $2}'`
+	local stripe_size=$($RUNAS $GETSTRIPE -S $testfile2)
+	local stripe_count=$($RUNAS $GETSTRIPE -c $testfile2)
 	[ $stripe_size -eq 65536 ] || error "stripe size $stripe_size != 65536"
 	[ $stripe_count -eq $STRIPECOUNT ] ||
 		error "stripe count $stripe_count != $STRIPECOUNT"
@@ -4934,59 +5778,34 @@ test_102c() {
 run_test 102c "non-root getfattr/setfattr for lustre.lov EAs ==========="
 
 compare_stripe_info1() {
-	local stripe_index_all_zero=1
+	local stripe_index_all_zero=true
 
-	for num in 1 2 3 4
-	do
- 		for count in `seq 1 $STRIPE_COUNT`
-		do
-			for offset in `seq 0 $[$STRIPE_COUNT - 1]`
-			do
-				local size=`expr $STRIPE_SIZE \* $num`
+	for num in 1 2 3 4; do
+		for count in $(seq 1 $STRIPE_COUNT); do
+			for offset in $(seq 0 $[$STRIPE_COUNT - 1]); do
+				local size=$((STRIPE_SIZE * num))
 				local file=file"$num-$offset-$count"
-				get_stripe_info client $PWD/$file "$1"
-				if [ $stripe_size -ne $size ]; then
-					error "$file: different stripe size $stripe_size, expected $size" && return
-				fi
-				if [ $stripe_count -ne $count ]; then
-					error "$file: different stripe count $stripe_count, expected $count" && return
-				fi
-				if [ $stripe_index -ne 0 ]; then
-				       stripe_index_all_zero=0
-				fi
+				stripe_size=$(lfs getstripe -S $PWD/$file)
+				[ $stripe_size -ne $size ] &&
+				    error "$file: size $stripe_size != $size"
+				stripe_count=$(lfs getstripe -c $PWD/$file)
+				# allow fewer stripes to be created, ORI-601
+				[ $stripe_count -lt $(((3 * count + 3) / 4)) ]&&
+				    error "$file: count $stripe_count != $count"
+				stripe_index=$(lfs getstripe -i $PWD/$file)
+				[ $stripe_index -ne 0 ] &&
+					stripe_index_all_zero=false
 			done
 		done
 	done
-	[ $stripe_index_all_zero -eq 1 ] && error "all files are being extracted starting from OST index 0"
+	$stripe_index_all_zero &&
+		error "all files are being extracted starting from OST index 0"
 	return 0
 }
 
-compare_stripe_info2() {
-	for num in 1 2 3 4
-	do
-		for count in `seq 1 $STRIPE_COUNT`
-		do
-			for offset in `seq 0 $[$STRIPE_COUNT - 1]`
-			do
-				local size=`expr $STRIPE_SIZE \* $num`
-				local file=file"$num-$offset-$count"
-				get_stripe_info client $PWD/$file
-				if [ $stripe_size -ne $size ]; then
-					error "$file: different stripe size $stripe_size, expected $size" && return
-				fi
-				if [ $stripe_count -ne $count ]; then
-					error "$file: different stripe count $stripe_count, expected $count" && return
-				fi
-				if [ $stripe_index -ne $offset ]; then
-					error "$file: different stripe offset $stripe_index, expected $offset" && return
-				fi
-			done
-		done
-	done
-}
-
 find_lustre_tar() {
-	[ -n "$(which tar 2>/dev/null)" ] && strings $(which tar) | grep -q lustre && echo tar
+	[ -n "$(which tar 2>/dev/null)" ] &&
+		strings $(which tar) | grep -q "lustre" && echo tar
 }
 
 test_102d() {
@@ -4995,7 +5814,7 @@ test_102d() {
 	[ -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
@@ -5008,7 +5827,7 @@ test_102f() {
 	[ -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
@@ -5082,7 +5901,7 @@ test_102j() {
 	[ -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
@@ -5096,22 +5915,42 @@ 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
-        local default_size=`$GETSTRIPE -s $test_kdir`
+        test_mkdir $test_kdir
+        local default_size=`$GETSTRIPE -S $test_kdir`
         local default_count=`$GETSTRIPE -c $test_kdir`
-        local default_offset=`$GETSTRIPE -o $test_kdir`
-        $SETSTRIPE -s 65536 -i 1 -c $OSTCOUNT $test_kdir || error 'dir setstripe failed'
+        local default_offset=`$GETSTRIPE -i $test_kdir`
+        $SETSTRIPE -S 65536 -i 1 -c $OSTCOUNT $test_kdir ||
+                error 'dir setstripe failed'
         setfattr -n trusted.lov $test_kdir
-        local stripe_size=`$GETSTRIPE -s $test_kdir`
+        local stripe_size=`$GETSTRIPE -S $test_kdir`
         local stripe_count=`$GETSTRIPE -c $test_kdir`
-        local stripe_offset=`$GETSTRIPE -o $test_kdir`
-        [ $stripe_size -eq $default_size ] || error "stripe size $stripe_size != $default_size"
-        [ $stripe_count -eq $default_count ] || error "stripe count $stripe_count != $default_count"
-        [ $stripe_offset -eq $default_offset ] || error "stripe offset $stripe_offset != $default_offset"
+        local stripe_offset=`$GETSTRIPE -i $test_kdir`
+        [ $stripe_size -eq $default_size ] ||
+                error "stripe size $stripe_size != $default_size"
+        [ $stripe_count -eq $default_count ] ||
+                error "stripe count $stripe_count != $default_count"
+        [ $stripe_offset -eq $default_offset ] ||
+                error "stripe offset $stripe_offset != $default_offset"
         rm -rf $DIR/$tfile $test_kdir
 }
 run_test 102k "setfattr without parameter of value shouldn't cause a crash"
 
+test_102l() {
+	# LU-532 trusted. xattr is invisible to non-root
+	local testfile=$DIR/$tfile
+
+	touch $testfile
+
+	echo "listxattr as user..."
+	chown $RUNAS_ID $testfile
+	$RUNAS getfattr -d -m '.*' $testfile 2>&1 |
+	    grep -q "trusted" &&
+		error "$testfile trusted xattrs are user visible"
+
+	return 0;
+}
+run_test 102l "listxattr filter test =================================="
+
 cleanup_test102
 
 run_acl_subtest()
@@ -5128,9 +5967,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
@@ -5154,14 +5993,20 @@ test_103 () {
     run_acl_subtest inheritance || error "inheritance test failed"
     rm -f make-tree
 
+    echo "LU-974 ignore umask when acl is enabled..."
+    mkdir $DIR/974
+    cd $DIR/974
+    run_acl_subtest 974 || error "LU-974 test failed"
+    rm -rf $DIR/974
+
     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 ========================================="
 
@@ -5235,7 +6080,7 @@ test_105c() {
 run_test 105c "lockf when mounted without -o flock test ========"
 
 test_105d() { # bug 15924
-        mkdir -p $DIR/$tdir
+        test_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
@@ -5253,7 +6098,7 @@ 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"
 }
@@ -5293,14 +6138,18 @@ 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"
 
@@ -5315,7 +6164,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
 
@@ -5323,9 +6172,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"
@@ -5351,7 +6200,7 @@ free_min_max () {
 	echo Max free space: OST $MAXI: $MAXV
 }
 
-test_116() {
+test_116a() { # was previously test_116()
 	[ "$OSTCOUNT" -lt "2" ] && skip_env "$OSTCOUNT < 2 OSTs" && return
 
 	echo -n "Free space priority "
@@ -5362,7 +6211,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"
@@ -5395,7 +6244,7 @@ test_116() {
 
 	# now fill using QOS
 	echo writing a bunch of files to QOS-assigned OSTs
-	$SETSTRIPE $DIR/$tdir -c 1
+	$SETSTRIPE -c 1 $DIR/$tdir
 	i=0
 	while [ $FILL -gt 0 ]; do
 	    i=$(($i + 1))
@@ -5434,7 +6283,21 @@ 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
+#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
 {
@@ -5463,17 +6326,17 @@ reset_async() {
 	FILE=$DIR/reset_async
 
 	# Ensure all OSCs are cleared
-	$LSTRIPE -c -1 $FILE
-        dd if=/dev/zero of=$FILE bs=64k count=$OSTCOUNT
+	$SETSTRIPE -c -1 $FILE
+	dd if=/dev/zero of=$FILE bs=64k count=$OSTCOUNT
 	sync
-        rm $FILE
+	rm $FILE
 }
 
 test_118a() #bug 11710
 {
 	reset_async
 
- 	multiop $DIR/$tfile oO_CREAT:O_RDWR:O_SYNC:w4096c
+	$MULTIOP $DIR/$tfile oO_CREAT:O_RDWR:O_SYNC:w4096c
 	DIRTY=$(lctl get_param -n llite.*.dump_page_cache | grep -c dirty)
         WRITEBACK=$(lctl get_param -n llite.*.dump_page_cache | grep -c writeback)
 
@@ -5493,7 +6356,7 @@ test_118b()
 
 	#define OBD_FAIL_OST_ENOENT 0x217
 	set_nodes_failloc "$(osts_nodes)" 0x217
-	multiop $DIR/$tfile oO_CREAT:O_RDWR:O_SYNC:w4096c
+	$MULTIOP $DIR/$tfile oO_CREAT:O_RDWR:O_SYNC:w4096c
 	RC=$?
 	set_nodes_failloc "$(osts_nodes)" 0
         DIRTY=$(lctl get_param -n llite.*.dump_page_cache | grep -c dirty)
@@ -5514,7 +6377,7 @@ test_118b()
 
 	# Due to the above error the OSC will issue all RPCs syncronously
 	# until a subsequent RPC completes successfully without error.
-	multiop $DIR/$tfile Ow4096yc
+	$MULTIOP $DIR/$tfile Ow4096yc
 	rm -f $DIR/$tfile
 
 	return 0
@@ -5531,7 +6394,7 @@ test_118c()
 	set_nodes_failloc "$(osts_nodes)" 0x216
 
 	# multiop should block due to fsync until pages are written
-	multiop $DIR/$tfile oO_CREAT:O_RDWR:O_SYNC:w4096c &
+	$MULTIOP $DIR/$tfile oO_CREAT:O_RDWR:O_SYNC:w4096c &
 	MULTIPID=$!
 	sleep 1
 
@@ -5574,7 +6437,7 @@ test_118d()
 	#define OBD_FAIL_OST_BRW_PAUSE_BULK
 	set_nodes_failloc "$(osts_nodes)" 0x214
 	# multiop should block due to fsync until pages are written
-	multiop $DIR/$tfile oO_CREAT:O_RDWR:O_SYNC:w4096c &
+	$MULTIOP $DIR/$tfile oO_CREAT:O_RDWR:O_SYNC:w4096c &
 	MULTIPID=$!
 	sleep 1
 
@@ -5611,7 +6474,7 @@ test_118f() {
         lctl set_param fail_loc=0x8000040a
 
 	# Should simulate EINVAL error which is fatal
-        multiop $DIR/$tfile oO_CREAT:O_RDWR:O_SYNC:w4096c
+        $MULTIOP $DIR/$tfile oO_CREAT:O_RDWR:O_SYNC:w4096c
         RC=$?
 	if [[ $RC -eq 0 ]]; then
 		error "Must return error due to dropped pages, rc=$RC"
@@ -5646,7 +6509,7 @@ test_118g() {
 	lctl set_param fail_loc=0x406
 
 	# simulate local -ENOMEM
-	multiop $DIR/$tfile oO_CREAT:O_RDWR:O_SYNC:w4096c
+	$MULTIOP $DIR/$tfile oO_CREAT:O_RDWR:O_SYNC:w4096c
 	RC=$?
 
 	lctl set_param fail_loc=0
@@ -5682,7 +6545,7 @@ test_118h() {
 	#define OBD_FAIL_OST_BRW_WRITE_BULK      0x20e
         set_nodes_failloc "$(osts_nodes)" 0x20e
 	# Should simulate ENOMEM error which is recoverable and should be handled by timeout
-        multiop $DIR/$tfile oO_CREAT:O_RDWR:O_SYNC:w4096c
+        $MULTIOP $DIR/$tfile oO_CREAT:O_RDWR:O_SYNC:w4096c
         RC=$?
 
         set_nodes_failloc "$(osts_nodes)" 0
@@ -5709,6 +6572,8 @@ test_118h() {
 }
 run_test 118h "Verify timeout in handling recoverables errors  =========="
 
+[ "$SLOW" = "no" ] && [ -n "$OLD_RESENDCOUNT" ] && set_resend_count $OLD_RESENDCOUNT
+
 test_118i() {
 	remote_ost_nodsh && skip "remote OST with nodsh" && return
 
@@ -5718,7 +6583,7 @@ test_118i() {
         set_nodes_failloc "$(osts_nodes)" 0x20e
 
 	# Should simulate ENOMEM error which is recoverable and should be handled by timeout
-        multiop $DIR/$tfile oO_CREAT:O_RDWR:O_SYNC:w4096c &
+        $MULTIOP $DIR/$tfile oO_CREAT:O_RDWR:O_SYNC:w4096c &
 	PID=$!
 	sleep 5
 	set_nodes_failloc "$(osts_nodes)" 0
@@ -5747,6 +6612,8 @@ test_118i() {
 }
 run_test 118i "Fix error before timeout in recoverable error  =========="
 
+[ "$SLOW" = "no" ] && set_resend_count 4
+
 test_118j() {
 	remote_ost_nodsh && skip "remote OST with nodsh" && return
 
@@ -5756,7 +6623,7 @@ test_118j() {
         set_nodes_failloc "$(osts_nodes)" 0x220
 
 	# return -EIO from OST
-        multiop $DIR/$tfile oO_CREAT:O_RDWR:O_SYNC:w4096c
+        $MULTIOP $DIR/$tfile oO_CREAT:O_RDWR:O_SYNC:w4096c
         RC=$?
         set_nodes_failloc "$(osts_nodes)" 0x0
 	if [[ $RC -eq 0 ]]; then
@@ -5788,7 +6655,7 @@ test_118k()
 
 	#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 || \
@@ -5807,8 +6674,8 @@ run_test 118k "bio alloc -ENOMEM and IO TERM handling ========="
 test_118l()
 {
 	# LU-646
-	mkdir -p $DIR/$tdir
-	multiop $DIR/$tdir Dy || error "fsync dir failed"
+	test_mkdir -p $DIR/$tdir
+	$MULTIOP $DIR/$tdir Dy || error "fsync dir failed"
 	rm -rf $DIR/$tdir
 }
 run_test 118l "fsync dir ========="
@@ -5838,7 +6705,7 @@ test_119b() # bug 11737
         $SETSTRIPE -c 2 $DIR/$tfile || error "setstripe failed"
         dd if=/dev/zero of=$DIR/$tfile bs=1M count=1 seek=1 || error "dd failed"
         sync
-        multiop $DIR/$tfile oO_RDONLY:O_DIRECT:r$((2048 * 1024)) || \
+        $MULTIOP $DIR/$tfile oO_RDONLY:O_DIRECT:r$((2048 * 1024)) || \
                 error "direct read failed"
         rm -f $DIR/$tfile
 }
@@ -5879,7 +6746,7 @@ 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
+        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
@@ -5888,7 +6755,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."
@@ -5899,7 +6766,7 @@ test_120a() {
 run_test 120a "Early Lock Cancel: mkdir test"
 
 test_120b() {
-        mkdir -p $DIR/$tdir
+        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
@@ -5919,12 +6786,12 @@ test_120b() {
 run_test 120b "Early Lock Cancel: create test"
 
 test_120c() {
-        mkdir -p $DIR/$tdir
+        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
@@ -5941,7 +6808,7 @@ test_120c() {
 run_test 120c "Early Lock Cancel: link test"
 
 test_120d() {
-        mkdir -p $DIR/$tdir
+        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
@@ -5962,7 +6829,7 @@ test_120d() {
 run_test 120d "Early Lock Cancel: setattr test"
 
 test_120e() {
-        mkdir -p $DIR/$tdir
+        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
@@ -5991,10 +6858,10 @@ run_test 120e "Early Lock Cancel: unlink test"
 test_120f() {
         [ -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
@@ -6025,7 +6892,7 @@ test_120g() {
         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`
@@ -6079,7 +6946,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
@@ -6153,7 +7020,7 @@ test_123a() { # was test 123, statahead(bug 11401)
 run_test 123a "verify statahead work"
 
 test_123b () { # statahead(bug 15027)
-	mkdir -p $DIR/$tdir
+	test_mkdir -p $DIR/$tdir
 	createmany -o $DIR/$tdir/$tfile-%d 1000
 
         cancel_lru_locks mdc
@@ -6175,7 +7042,7 @@ test_124a() {
 	[ -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 ||
@@ -6279,7 +7146,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
@@ -6303,7 +7170,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
@@ -6339,8 +7206,8 @@ 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"
-	$SETSTRIPE $DIR/d125 -s 65536 -c -1 || error "setstripe 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"
 }
@@ -6455,28 +7322,34 @@ 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() {
-	[ "$FSTYPE" != "ldiskfs" ] && skip "not needed for FSTYPE=$FSTYPE" && return 0
+	if [ "$(facet_fstype $SINGLEMDS)" != ldiskfs ]; then
+		skip "Only applicable to ldiskfs-based MDTs"
+		return
+	fi
 	remote_mds_nodsh && skip "remote MDS with nodsh" && return
 
 	EFBIG=27
 	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
+		$MULTIOP $DIR/$tdir/$J Oc
 		rc=$?
 		if [ $rc -eq $EFBIG ]; then
 			set_dir_limits 0
@@ -6502,19 +7375,27 @@ 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
-	lfs setstripe -s 65536 -c 1 $fm_file || error "setstripe failed on $fm_file"
-	dd if=/dev/zero of=$fm_file bs=65536 count=1 || error "dd failed for $fm_file"
+	$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"
 
-	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"
 
-	lun=`$GETSTRIPE $fm_file  | grep -A 10 obdidx | awk '{print $1}' | grep -v "obdidx"`
+	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`
 	IFS=$'\n'
@@ -6544,21 +7425,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
-	lfs setstripe -s 65536 -c 2 $fm_file || error "setstripe failed on $fm_file"
-	dd if=/dev/zero of=$fm_file bs=1M count=2 || error "dd failed on $fm_file"
+	$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 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
@@ -6593,15 +7481,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
-	lfs setstripe -s 65536 -c 2 $fm_file || error "setstripe failed on $fm_file"
+	$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"
@@ -6656,7 +7549,9 @@ test_130d() {
 	trap cleanup_130 EXIT RETURN
 
 	local fm_file=$DIR/$tfile
-	lfs setstripe -s 65536 -c $OSTCOUNT $fm_file || error "setstripe failed on $fm_file"
+	$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"
@@ -6705,7 +7600,10 @@ test_130e() {
 	trap cleanup_130 EXIT RETURN
 
 	local fm_file=$DIR/$tfile
-	lfs setstripe -s 131072 -c 2 $fm_file || error "setstripe failed on $fm_file"
+	$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++))
@@ -6888,6 +7786,9 @@ check_stats() {
 test_133a() {
 	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 ||
+		{ skip "MDS doesn't support rename stats"; return; }
 	local testdir=$DIR/${tdir}/stats_testdir
 	mkdir -p $DIR/${tdir}
 
@@ -6941,6 +7842,12 @@ test_133b() {
 	# extra mdt stats verification.
 	chmod 444 ${testdir}/${tfile} || error "chmod failed"
 	check_stats $SINGLEMDS "setattr" 1
+	do_facet $SINGLEMDS $LCTL set_param mdt.*.md_stats=clear
+	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
 
@@ -6952,12 +7859,13 @@ test_133c() {
 	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.
-	$LFS setstripe -c 1 -o 0 ${testdir}/${tfile}
+	$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
@@ -6975,6 +7883,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}
@@ -7023,68 +7932,95 @@ size_in_KMGT() {
 
 get_rename_size() {
     local size=$1
-    local sample=$(do_facet $SINGLEMDS $LCTL get_param mdt.*.rename_stats | \
-                   awk '/ '${size}'/ {print $4}' | sed -e "s/,//g")
+    local context=${2:-.}
+    local sample=$(do_facet $SINGLEMDS $LCTL get_param mdt.*.rename_stats |
+		grep -A1 $context |
+		awk '/ '${size}'/ {print $4}' | sed -e "s/,//g")
     echo $sample
 }
 
 test_133d() {
     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 ||
+        { skip "MDS doesn't support rename stats"; return; }
+
     local testdir1=$DIR/${tdir}/stats_testdir1
     local testdir2=$DIR/${tdir}/stats_testdir2
 
     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"
-    local testdir1_size=$(ls -l $DIR/${tdir} | \
-                          awk '/stats_testdir1/ {print $5}')
-    local testdir2_size=$(ls -l $DIR/${tdir} | \
-                          awk '/stats_testdir2/ {print $5}')
 
-    testdir1_size=$(order_2 $testdir1_size)
-    testdir2_size=$(order_2 $testdir2_size)
+	# check samedir rename size
+	mv ${testdir1}/test0 ${testdir1}/test_0
+
+	local testdir1_size=$(ls -l $DIR/${tdir} |
+		awk '/stats_testdir1/ {print $5}')
+	local testdir2_size=$(ls -l $DIR/${tdir} |
+		awk '/stats_testdir2/ {print $5}')
+
+	testdir1_size=$(order_2 $testdir1_size)
+	testdir2_size=$(order_2 $testdir2_size)
 
-    testdir1_size=$(size_in_KMGT $testdir1_size)
-    testdir2_size=$(size_in_KMGT $testdir2_size)
+	testdir1_size=$(size_in_KMGT $testdir1_size)
+	testdir2_size=$(size_in_KMGT $testdir2_size)
 
-    # check samedir rename size
-    mv ${testdir1}/test0 ${testdir1}/test_0
-    local samedir=$(do_facet $SINGLEMDS $LCTL get_param mdt.*.rename_stats | \
-                    grep 'same_dir')
+	echo "source rename dir size: ${testdir1_size}"
+	echo "target rename dir size: ${testdir2_size}"
+
+    local cmd="do_facet $SINGLEMDS $LCTL get_param mdt.*.rename_stats"
+    eval $cmd || error "$cmd failed"
+    local samedir=$($cmd | grep 'same_dir')
     local same_sample=$(get_rename_size $testdir1_size)
     [ -z "$samedir" ] && error "samedir_rename_size count error"
-    [ $same_sample -eq 1 ] || error "samedir_rename_size count error"
+    [ "$same_sample" -eq 1 ] || error "samedir_rename_size error $same_sample"
     echo "Check same dir rename stats success"
 
-    # check crossdir rename size
     do_facet $SINGLEMDS $LCTL set_param mdt.*.rename_stats=clear
+
+    # check crossdir rename size
     mv ${testdir1}/test_0 ${testdir2}/test_0
-    local crossdir=$(do_facet $SINGLEMDS $LCTL get_param mdt.*.rename_stats | \
-                     grep 'crossdir')
-    local src_sample=$(get_rename_size $testdir1_size)
-    local tgt_sample=$(get_rename_size $testdir2_size)
+
+	testdir1_size=$(ls -l $DIR/${tdir} |
+		awk '/stats_testdir1/ {print $5}')
+	testdir2_size=$(ls -l $DIR/${tdir} |
+		awk '/stats_testdir2/ {print $5}')
+
+	testdir1_size=$(order_2 $testdir1_size)
+	testdir2_size=$(order_2 $testdir2_size)
+
+	testdir1_size=$(size_in_KMGT $testdir1_size)
+	testdir2_size=$(size_in_KMGT $testdir2_size)
+
+	echo "source rename dir size: ${testdir1_size}"
+	echo "target rename dir size: ${testdir2_size}"
+
+    eval $cmd || error "$cmd failed"
+    local crossdir=$($cmd | grep 'crossdir')
+    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 count error"
-    [ $tgt_sample -eq 1 ] || 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"
     echo "Check cross dir rename stats success"
-
     rm -rf $DIR/${tdir}
 }
 run_test 133d "Verifying rename_stats ========================================"
 
 test_140() { #bug-17379
-        mkdir -p $DIR/$tdir || error "Creating dir $DIR/$tdir"
+        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,
@@ -7102,7 +8038,14 @@ 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) ===="
 
@@ -7138,44 +8081,43 @@ test_150() {
 run_test 150 "truncate/append tests"
 
 function roc_hit() {
-    local list=$(comma_list $(osts_nodes))
+	local list=$(comma_list $(osts_nodes))
 
-    ACCNUM=$(do_nodes $list $LCTL get_param -n obdfilter.*.stats | \
-        awk '/'cache_hit'/ {sum+=$2} END {print sum}')
-    echo $ACCNUM
+	echo $(get_obdfilter_param $list '' stats |
+	       awk '/'cache_hit'/ {sum+=$2} END {print sum}')
 }
 
 function set_cache() {
-    local on=1
+	local on=1
 
-    if [ "$2" == "off" ]; then
-        on=0;
-    fi
-    local list=$(comma_list $(osts_nodes))
-    do_nodes $list lctl set_param obdfilter.*.${1}_cache_enable $on
+	if [ "$2" == "off" ]; then
+		on=0;
+	fi
+	local list=$(comma_list $(osts_nodes))
+	set_obdfilter_param $list '' $1_cache_enable $on
 
-    cancel_lru_locks osc
+	cancel_lru_locks osc
 }
 
 test_151() {
-        remote_ost_nodsh && skip "remote OST with nodsh" && return
+	remote_ost_nodsh && skip "remote OST with nodsh" && return
 
-        local CPAGES=3
-        local list=$(comma_list $(osts_nodes))
+	local CPAGES=3
+	local list=$(comma_list $(osts_nodes))
 
-        # check whether obdfilter is cache capable at all
-        if ! do_nodes $list $LCTL get_param -n obdfilter.*.read_cache_enable > /dev/null; then
-                echo "not cache-capable obdfilter"
-                return 0
-        fi
+	# check whether obdfilter is cache capable at all
+	if ! get_obdfilter_param $list '' read_cache_enable >/dev/null; then
+		echo "not cache-capable obdfilter"
+		return 0
+	fi
 
-        # check cache is enabled on all obdfilters
-        if do_nodes $list $LCTL get_param -n obdfilter.*.read_cache_enable | grep 0 >&/dev/null; then
-                echo "oss cache is disabled"
-                return 0
-        fi
+	# check cache is enabled on all obdfilters
+	if get_obdfilter_param $list '' read_cache_enable | grep 0; then
+		echo "oss cache is disabled"
+		return 0
+	fi
 
-        do_nodes $list $LCTL set_param -n obdfilter.*.writethrough_cache_enable 1
+	set_obdfilter_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"
@@ -7189,7 +8131,7 @@ test_151() {
 
         # the following read invalidates the cache
         cancel_lru_locks osc
-        do_nodes $list $LCTL set_param -n obdfilter.*.read_cache_enable 0
+	set_obdfilter_param $list '' read_cache_enable 0
         cat $DIR/$tfile >/dev/null
 
         # now data shouldn't be found in the cache
@@ -7201,7 +8143,7 @@ test_151() {
                 error "IN CACHE: before: $BEFORE, after: $AFTER"
         fi
 
-        do_nodes $list $LCTL set_param -n obdfilter.*.read_cache_enable 1
+	set_obdfilter_param $list '' read_cache_enable 1
         rm -f $DIR/$tfile
 }
 run_test 151 "test cache on oss and controls ==============================="
@@ -7230,23 +8172,122 @@ test_152() {
 run_test 152 "test read/write with enomem ============================"
 
 test_153() {
-        multiop $DIR/$tfile Ow4096Ycu || error "multiop failed"
+        $MULTIOP $DIR/$tfile Ow4096Ycu || error "multiop failed"
 }
 run_test 153 "test if fdatasync does not crash ======================="
 
 test_154() {
+	[[ $(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)
 	rc=$?
 	[ $rc -ne 0 ] && error "error: could not get fid for $DIR/$tfile."
 
-	echo "open fid $fid"
-	diff /etc/hosts $DIR/.lustre/fid/$fid || error "open by fid failed: did not find expected data in file."
+	ffid=$DIR/.lustre/fid/$fid
+
+	echo "stat fid $fid"
+	stat $ffid > /dev/null || error "stat $ffid failed."
+	echo "touch fid $fid"
+	touch $ffid || error "touch $ffid failed."
+	echo "write to fid $fid"
+	cat /etc/hosts > $ffid || error "write $ffid failed."
+	echo "read fid $fid"
+	diff /etc/hosts $ffid || error "read $ffid failed."
+	echo "append write to fid $fid"
+	cat /etc/hosts >> $ffid || error "append write $ffid failed."
+	echo "rename fid $fid"
+	mv $ffid $DIR/$tfile.1 && error "rename $ffid to $tfile.1 should fail."
+	touch $DIR/$tfile.1
+	mv $DIR/$tfile.1 $ffid && error "rename $tfile.1 to $ffid should fail."
+	rm -f $DIR/$tfile.1
+	echo "truncate fid $fid"
+	$TRUNCATE $ffid 777 || error "truncate $ffid failed."
+	echo "link fid $fid"
+	ln -f $ffid $DIR/tfile.lnk || error "link $ffid failed."
+	if [ -n $(lctl get_param -n mdc.*-mdc-*.connect_flags | grep acl) ]; then
+		echo "setfacl fid $fid"
+		setfacl -R -m u:bin:rwx $ffid || error "setfacl $ffid failed."
+		echo "getfacl fid $fid"
+		getfacl $ffid >/dev/null || error "getfacl $ffid failed."
+	fi
+	echo "unlink fid $fid"
+	unlink $DIR/.lustre/fid/$fid && error "unlink $ffid should fail."
+	echo "mknod fid $fid"
+	mknod $ffid c 1 3 && error "mknod $ffid should fail."
+
+	fid=[0xf00000400:0x1:0x0]
+	ffid=$DIR/.lustre/fid/$fid
+
+	echo "stat non-exist fid $fid"
+	stat $ffid > /dev/null && error "stat non-exist $ffid should fail."
+	echo "write to non-exist fid $fid"
+	cat /etc/hosts > $ffid && error "write non-exist $ffid should fail."
+	echo "link new fid $fid"
+	ln $DIR/$tfile $ffid && error "link $ffid should fail."
+
+	test_mkdir -p $DIR/$tdir
+	touch $DIR/$tdir/$tfile
+	fid=$($LFS path2fid $DIR/$tdir)
+	rc=$?
+	[ $rc -ne 0 ] && error "error: could not get fid for $DIR/$tfile."
+
+	ffid=$DIR/.lustre/fid/$fid
+
+	echo "ls $fid"
+	ls $ffid > /dev/null || error "ls $ffid failed."
+	echo "touch $fid/$tfile.1"
+	touch $ffid/$tfile.1 || error "touch $ffid/$tfile.1 failed."
+
+	echo "touch $DIR/.lustre/fid/$tfile"
+	touch $DIR/.lustre/fid/$tfile && \
+		error "touch $DIR/.lustre/fid/$tfile should fail."
 
-	echo "Opening a file by FID succeeded"
+	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 "Opening a file by FID"
+run_test 154 "Open-by-FID"
 
 test_155_small_load() {
     local temp=$TMP/$tfile
@@ -7366,6 +8407,10 @@ test_156() {
     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
     set_cache writethrough on
@@ -7521,13 +8566,15 @@ changelog_chmask()
 
 test_160() {
     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; }
     USER=$(do_facet $SINGLEMDS $LCTL --device $MDT0 changelog_register -n)
     echo "Registered as changelog user $USER"
     do_facet $SINGLEMDS $LCTL get_param -n mdd.$MDT0.changelog_users | \
 	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
@@ -7541,13 +8588,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
@@ -7608,10 +8655,10 @@ test_160() {
 run_test 160 "changelog sanity"
 
 test_161() {
-    mkdir -p $DIR/$tdir
+    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
@@ -7668,12 +8715,12 @@ check_path() {
 
 test_162() {
 	# Make changes to filesystem
-	mkdir -p $DIR/$tdir/d2
+	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
@@ -7725,11 +8772,11 @@ run_test 163 "kernel <-> userspace comms"
 test_169() {
 	# do directio so as not to populate the page cache
 	log "creating a 10 Mb file"
-	multiop $DIR/$tfile oO_CREAT:O_DIRECT:O_RDWR:w$((10*1048576))c || error "multiop failed while creating a file"
+	$MULTIOP $DIR/$tfile oO_CREAT:O_DIRECT:O_RDWR:w$((10*1048576))c || error "multiop failed while creating a file"
 	log "starting reads"
 	dd if=$DIR/$tfile of=/dev/null bs=4096 &
 	log "truncating the file"
-	multiop $DIR/$tfile oO_TRUNC:c || error "multiop failed while truncating the file"
+	$MULTIOP $DIR/$tfile oO_TRUNC:c || error "multiop failed while truncating the file"
 	log "killing dd"
 	kill %+ || true # reads might have finished
 	echo "wait until dd is finished"
@@ -7897,7 +8944,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
@@ -7915,321 +8962,575 @@ test_181() { # bug 22177
 }
 run_test 181 "Test open-unlinked dir ========================"
 
-# OST pools tests
-POOL=${POOL:-cea1}
-TGT_COUNT=$OSTCOUNT
-TGTPOOL_FIRST=1
-TGTPOOL_MAX=$(($TGT_COUNT - 1))
-TGTPOOL_STEP=2
-TGTPOOL_LIST=`seq $TGTPOOL_FIRST $TGTPOOL_STEP $TGTPOOL_MAX`
-POOL_ROOT=${POOL_ROOT:-$DIR/d200.pools}
-POOL_DIR_NAME=dir_tst
-POOL_DIR=$POOL_ROOT/$POOL_DIR_NAME
-POOL_FILE=$POOL_ROOT/file_tst
+test_182() {
+	# disable MDC RPC lock wouldn't crash client
+	local fcount=1000
+	local tcount=4
+
+	mkdir -p $DIR/$tdir || error "creating dir $DIR/$tdir"
+#define OBD_FAIL_MDC_RPCS_SEM		0x804
+	$LCTL set_param fail_loc=0x804
+
+	for (( i=0; i < $tcount; i++ )) ; do
+		mkdir $DIR/$tdir/$i
+		createmany -o $DIR/$tdir/$i/f- $fcount &
+	done
+	wait
+
+	for (( i=0; i < $tcount; i++ )) ; do
+		unlinkmany $DIR/$tdir/$i/f- $fcount &
+	done
+	wait
+
+	rm -rf $DIR/$tdir
+
+	$LCTL set_param fail_loc=0
+}
+run_test 182 "Disable MDC RPCs semaphore wouldn't crash client ================"
+
+test_183() { # LU-2275
+	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 ========"
+
+# OST pools tests
 check_file_in_pool()
 {
-	file=$1
-	res=$($GETSTRIPE $file | grep 0x | cut -f2)
+	local file=$1
+	local pool=$2
+	local tlist="$3"
+	local res=$($GETSTRIPE $file | grep 0x | cut -f2)
 	for i in $res
 	do
-		found=$(echo :$TGTPOOL_LIST: | tr " " ":"  | grep :$i:)
-		if [[ "$found" == "" ]]
-		then
-			echo "pool list: $TGTPOOL_LIST"
-			echo "striping: $res"
-			error "$file not allocated in $POOL"
-			return 1
-		fi
+		for t in $tlist ; do
+			[ "$i" -eq "$t" ] && continue 2
+		done
+
+		echo "pool list: $tlist"
+		echo "striping: $res"
+		error_noexit "$file not allocated in $pool"
+		return 1
 	done
 	return 0
 }
 
-trap "cleanup_pools $FSNAME" EXIT
+pool_add() {
+	echo "Creating new pool"
+	local pool=$1
 
-test_200a() {
-	remote_mgs_nodsh && skip "remote MGS with nodsh" && return
-    create_pool $FSNAME.$POOL || return $?
-	[ $($LFS pool_list $FSNAME | grep -c $POOL) -eq 1 ] ||
-		error "$POOL not in lfs pool_list"
+	create_pool $FSNAME.$pool ||
+		{ error_noexit "No pool created, result code $?"; return 1; }
+	[ $($LFS pool_list $FSNAME | grep -c $pool) -eq 1 ] ||
+		{ error_noexit "$pool not in lfs pool_list"; return 2; }
 }
-run_test 200a "Create new pool =========================================="
 
-test_200b() {
-	remote_mgs_nodsh && skip "remote MGS with nodsh" && return
-	TGT=$(for i in $TGTPOOL_LIST; do printf "$FSNAME-OST%04x_UUID " $i; done)
-	do_facet mgs $LCTL pool_add $FSNAME.$POOL \
-		$FSNAME-OST[$TGTPOOL_FIRST-$TGTPOOL_MAX/$TGTPOOL_STEP]
-	wait_update $HOSTNAME "lctl get_param -n lov.$FSNAME-*.pools.$POOL | sort -u | tr '\n' ' ' " "$TGT" ||
-		error "Add to pool failed"
-	local lfscount=$($LFS pool_list $FSNAME.$POOL | grep -c "\-OST")
-	local addcount=$((($TGTPOOL_MAX - $TGTPOOL_FIRST) / $TGTPOOL_STEP + 1))
-	[ $lfscount -eq $addcount ] ||
-		error "lfs pool_list bad ost count $lfscount != $addcount"
-}
-run_test 200b "Add targets to a pool ===================================="
-
-test_200c() {
-	remote_mgs_nodsh && skip "remote MGS with nodsh" && return
-	mkdir -p $POOL_DIR
-	$SETSTRIPE -c 2 -p $POOL $POOL_DIR
-	[ $? = 0 ] || error "Cannot set pool $POOL to $POOL_DIR"
-	# b-19919 test relative path works well
-	mkdir -p $POOL_DIR/$POOL_DIR_NAME
-	cd $POOL_DIR
-	$SETSTRIPE -c 2 -p $POOL $POOL_DIR_NAME
-	[ $? = 0 ] || error "Cannot set pool $POOL to $POOL_DIR/$POOL_DIR_NAME"
-	$SETSTRIPE -c 2 -p $POOL ./$POOL_DIR_NAME
-	[ $? = 0 ] || error "Cannot set pool $POOL to $POOL_DIR/./$POOL_DIR_NAME"
-	$SETSTRIPE -c 2 -p $POOL ../$POOL_DIR_NAME
-	[ $? = 0 ] || error "Cannot set pool $POOL to $POOL_DIR/../$POOL_DIR_NAME"
-	$SETSTRIPE -c 2 -p $POOL ../$POOL_DIR_NAME/$POOL_DIR_NAME
-	[ $? = 0 ] || error "Cannot set pool $POOL to $POOL_DIR/../$POOL_DIR_NAME/$POOL_DIR_NAME"
-	rm -rf $POOL_DIR_NAME; cd -
-}
-run_test 200c "Set pool on a directory ================================="
-
-test_200d() {
-	remote_mgs_nodsh && skip "remote MGS with nodsh" && return
-	res=$($GETSTRIPE --pool $POOL_DIR)
-	[ $res = $POOL ] || error "Pool on $POOL_DIR is $res, not $POOL"
+pool_add_targets() {
+	echo "Adding targets to pool"
+	local pool=$1
+	local first=$2
+	local last=$3
+	local step=${4:-1}
+
+	local list=$(seq $first $step $last)
+
+	local t=$(for i in $list; do printf "$FSNAME-OST%04x_UUID " $i; done)
+	do_facet mgs $LCTL pool_add \
+			$FSNAME.$pool $FSNAME-OST[$first-$last/$step]
+	wait_update $HOSTNAME "lctl get_param -n lov.$FSNAME-*.pools.$pool \
+			| sort -u | tr '\n' ' ' " "$t" || { 
+		error_noexit "Add to pool failed"
+		return 1
+	}
+	local lfscount=$($LFS pool_list $FSNAME.$pool | grep -c "\-OST")
+	local addcount=$(((last - first) / step + 1))
+	[ $lfscount -eq $addcount ] || {
+		error_noexit "lfs pool_list bad ost count" \
+						"$lfscount != $addcount"
+		return 2
+	}
 }
-run_test 200d "Check pool on a directory ==============================="
 
-test_200e() {
-	remote_mgs_nodsh && skip "remote MGS with nodsh" && return
-	failed=0
-	for i in $(seq -w 1 $(($TGT_COUNT * 3)))
+pool_set_dir() {
+	local pool=$1
+	local tdir=$2
+	echo "Setting pool on directory $tdir"
+
+	$SETSTRIPE -c 2 -p $pool $tdir && return 0
+
+	error_noexit "Cannot set pool $pool to $tdir"
+	return 1
+}
+
+pool_check_dir() {
+	local pool=$1
+	local tdir=$2
+	echo "Checking pool on directory $tdir"
+
+	local res=$($GETSTRIPE --pool $tdir | sed "s/\s*$//")
+	[ "$res" = "$pool" ] && return 0
+
+	error_noexit "Pool on '$tdir' is '$res', not '$pool'"
+	return 1
+}
+
+pool_dir_rel_path() {
+	echo "Testing relative path works well"
+	local pool=$1
+	local tdir=$2
+	local root=$3
+
+	mkdir -p $root/$tdir/$tdir
+	cd $root/$tdir
+	pool_set_dir $pool $tdir          || return 1
+	pool_set_dir $pool ./$tdir        || return 2
+	pool_set_dir $pool ../$tdir       || return 3
+	pool_set_dir $pool ../$tdir/$tdir || return 4
+	rm -rf $tdir; cd - > /dev/null
+}
+
+pool_alloc_files() {
+	echo "Checking files allocation from directory pool"
+	local pool=$1
+	local tdir=$2
+	local count=$3
+	local tlist="$4"
+
+	local failed=0
+	for i in $(seq -w 1 $count)
 	do
-		file=$POOL_DIR/file-$i
+		local file=$tdir/file-$i
 		touch $file
-		check_file_in_pool $file
-		if [[ $? != 0 ]]
-		then
-			failed=$(($failed + 1))
-		fi
+		check_file_in_pool $file $pool "$tlist" || \
+			failed=$((failed + 1))
 	done
-	[ "$failed" = 0 ] || error "$failed files not allocated in $POOL"
+	[ "$failed" = 0 ] && return 0
+
+	error_noexit "$failed files not allocated in $pool"
+	return 1
 }
-run_test 200e "Check files allocation from directory pool =============="
 
-test_200f() {
-	remote_mgs_nodsh && skip "remote MGS with nodsh" && return
-	mkdir -p $POOL_FILE
-	failed=0
-	for i in $(seq -w 1 $(($TGT_COUNT * 3)))
+pool_create_files() {
+	echo "Creating files in pool"
+	local pool=$1
+	local tdir=$2
+	local count=$3
+	local tlist="$4"
+
+	mkdir -p $tdir
+	local failed=0
+	for i in $(seq -w 1 $count)
 	do
-		file=$POOL_FILE/spoo-$i
-		$SETSTRIPE -p $POOL $file
-		check_file_in_pool $file
-		if [[ $? != 0 ]]
-		then
-			failed=$(($failed + 1))
-		fi
+		local file=$tdir/spoo-$i
+		$SETSTRIPE -p $pool $file
+		check_file_in_pool $file $pool "$tlist" || \
+			failed=$((failed + 1))
 	done
-	[ "$failed" = 0 ] || error "$failed files not allocated in $POOL"
+	[ "$failed" = 0 ] && return 0
+
+	error_noexit "$failed files not allocated in $pool"
+	return 1
 }
-run_test 200f "Create files in a pool ==================================="
 
-test_200g() {
-	remote_mgs_nodsh && skip "remote MGS with nodsh" && return
-	TGT=$($LCTL get_param -n lov.$FSNAME-clilov-*.pools.$POOL | tr '\n' ' ')
-	res=$($LFS df --pool $FSNAME.$POOL | awk '{print $1}' | grep "$FSNAME-OST" | tr '\n' ' ')
-	[ "$res" = "$TGT" ] || error "Pools OSTs '$TGT' is not '$res' that lfs df reports"
+pool_lfs_df() {
+	echo "Checking 'lfs df' output"
+	local pool=$1
+
+	local t=$($LCTL get_param -n lov.$FSNAME-clilov-*.pools.$pool |
+			tr '\n' ' ')
+	local res=$($LFS df --pool $FSNAME.$pool |
+			awk '{print $1}' |
+			grep "$FSNAME-OST" |
+			tr '\n' ' ')
+	[ "$res" = "$t" ] && return 0
+
+	error_noexit "Pools OSTs '$t' is not '$res' that lfs df reports"
+	return 1
 }
-run_test 200g "lfs df a pool ============================================"
 
-test_200h() { # b=24039
-	mkdir -p $POOL_DIR || error "unable to create $POOL_DIR"
+pool_file_rel_path() {
+	echo "Creating files in a pool with relative pathname"
+	local pool=$1
+	local tdir=$2
 
-	local file="/..$POOL_DIR/$tfile-1"
-	$SETSTRIPE -p $POOL $file || error "unable to create $file"
+	mkdir -p $tdir ||
+		{ error_noexit "unable to create $tdir"; return 1 ; }
+	local file="/..$tdir/$tfile-1"
+	$SETSTRIPE -p $pool $file ||
+		{ error_noexit "unable to create $file" ; return 2 ; }
 
-	cd $POOL_DIR
-	$SETSTRIPE -p $POOL $tfile-2 || \
-		error "unable to create $tfile-2 in $POOL_DIR"
+	cd $tdir
+	$SETSTRIPE -p $pool $tfile-2 || {
+		error_noexit "unable to create $tfile-2 in $tdir"
+		return 3
+	}
 }
-run_test 200h "Create files in a pool with relative pathname ============"
 
-test_201a() {
-	remote_mgs_nodsh && skip "remote MGS with nodsh" && return
-	TGT=$($LCTL get_param -n lov.$FSNAME-*.pools.$POOL | head -1)
-	do_facet mgs $LCTL pool_remove $FSNAME.$POOL $TGT
-	wait_update $HOSTNAME "lctl get_param -n lov.$FSNAME-*.pools.$POOL | grep $TGT" "" ||
-		error "$TGT not removed from $FSNAME.$POOL"
+pool_remove_first_target() {
+	echo "Removing first target from a pool"
+	local pool=$1
+
+	local pname="lov.$FSNAME-*.pools.$pool"
+	local t=$($LCTL get_param -n $pname | head -1)
+	do_facet mgs $LCTL pool_remove $FSNAME.$pool $t
+	wait_update $HOSTNAME "lctl get_param -n $pname | grep $t" "" || {
+		error_noexit "$t not removed from $FSNAME.$pool"
+		return 1
+	}
 }
-run_test 201a "Remove a target from a pool ============================="
 
-test_201b() {
-	remote_mgs_nodsh && skip "remote MGS with nodsh" && return
-	for TGT in $($LCTL get_param -n lov.$FSNAME-*.pools.$POOL | sort -u)
+pool_remove_all_targets() {
+	echo "Removing all targets from pool"
+	local pool=$1
+	local file=$2
+	local pname="lov.$FSNAME-*.pools.$pool"
+	for t in $($LCTL get_param -n $pname | sort -u)
 	do
-		do_facet mgs $LCTL pool_remove $FSNAME.$POOL $TGT
- 	done
-	wait_update $HOSTNAME "lctl get_param -n lov.$FSNAME-*.pools.$POOL" "" ||
-		error "Pool $FSNAME.$POOL cannot be drained"
-	# striping on an empty/nonexistant pool should fall back to "pool of everything"
-	touch ${POOL_DIR}/$tfile || error "failed to use fallback striping for empty pool"
+		do_facet mgs $LCTL pool_remove $FSNAME.$pool $t
+	done
+	wait_update $HOSTNAME "lctl get_param -n $pname" "" || {
+		error_noexit "Pool $FSNAME.$pool cannot be drained"
+		return 1
+	}
+	# striping on an empty/nonexistant pool should fall back 
+	# to "pool of everything"
+	touch $file || {
+		error_noexit "failed to use fallback striping for empty pool"
+		return 2
+	}
 	# setstripe on an empty pool should fail
-	$SETSTRIPE -p $POOL ${POOL_FILE}/$tfile 2>/dev/null && \
-		error "expected failure when creating file with empty pool"
+	$SETSTRIPE -p $pool $file 2>/dev/null && {
+		error_noexit "expected failure when creating file" \
+							"with empty pool"
+		return 3
+	}
 	return 0
 }
-run_test 201b "Remove all targets from a pool =========================="
 
-test_201c() {
-	remote_mgs_nodsh && skip "remote MGS with nodsh" && return
-	do_facet mgs $LCTL pool_destroy $FSNAME.$POOL
+pool_remove() {
+	echo "Destroying pool"
+	local pool=$1
+	local file=$2
+
+	do_facet mgs $LCTL pool_destroy $FSNAME.$pool
 
 	sleep 2
-    # striping on an empty/nonexistant pool should fall back to "pool of everything"
-	touch ${POOL_DIR}/$tfile || error "failed to use fallback striping for missing pool"
+	# striping on an empty/nonexistant pool should fall back 
+	# to "pool of everything"
+	touch $file || {
+		error_noexit "failed to use fallback striping for missing pool"
+		return 1
+	}
 	# setstripe on an empty pool should fail
-	$SETSTRIPE -p $POOL ${POOL_FILE}/$tfile 2>/dev/null && \
-		error "expected failure when creating file with missing pool"
+	$SETSTRIPE -p $pool $file 2>/dev/null && {
+		error_noexit "expected failure when creating file" \
+							"with missing pool"
+		return 2
+	}
 
 	# get param should return err once pool is gone
-	if wait_update $HOSTNAME "lctl get_param -n lov.$FSNAME-*.pools.$POOL 2>/dev/null ||
-			echo foo" "foo"; then
-		remove_pool_from_list $FSNAME.$POOL
+	if wait_update $HOSTNAME "lctl get_param -n \
+		lov.$FSNAME-*.pools.$pool 2>/dev/null || echo foo" "foo"
+	then
+		remove_pool_from_list $FSNAME.$pool
 		return 0
 	fi
-	error "Pool $FSNAME.$POOL is not destroyed"
+	error_noexit "Pool $FSNAME.$pool is not destroyed"
+	return 3
 }
-run_test 201c "Remove a pool ============================================"
 
-cleanup_pools $FSNAME
+test_200() {
+	remote_mgs_nodsh && skip "remote MGS with nodsh" && return
+
+	local POOL=${POOL:-cea1}
+	local POOL_ROOT=${POOL_ROOT:-$DIR/d200.pools}
+	local POOL_DIR_NAME=${POOL_DIR_NAME:-dir_tst}
+	# Pool OST targets
+	local first_ost=0
+	local last_ost=$(($OSTCOUNT - 1))
+	local ost_step=2
+	local ost_list=$(seq $first_ost $ost_step $last_ost)
+	local ost_range="$first_ost $last_ost $ost_step"
+	local test_path=$POOL_ROOT/$POOL_DIR_NAME
+	local file_dir=$POOL_ROOT/file_tst
+
+	local rc=0
+	while : ; do
+		# former test_200a test_200b
+		pool_add $POOL				|| { rc=$? ; break; }
+		pool_add_targets  $POOL $ost_range	|| { rc=$? ; break; }
+		# former test_200c test_200d
+		mkdir -p $test_path
+		pool_set_dir      $POOL $test_path	|| { rc=$? ; break; }
+		pool_check_dir    $POOL $test_path	|| { rc=$? ; break; }
+		pool_dir_rel_path $POOL $POOL_DIR_NAME $POOL_ROOT \
+							|| { rc=$? ; break; }
+		# former test_200e test_200f
+		local files=$((OSTCOUNT*3))
+		pool_alloc_files  $POOL $test_path $files "$ost_list" \
+							|| { rc=$? ; break; }
+		pool_create_files $POOL $file_dir $files "$ost_list" \
+							|| { rc=$? ; break; }
+		# former test_200g test_200h
+		pool_lfs_df $POOL 			|| { rc=$? ; break; }
+		pool_file_rel_path $POOL $test_path	|| { rc=$? ; break; }
+
+		# former test_201a test_201b test_201c
+		pool_remove_first_target $POOL		|| { rc=$? ; break; }
+
+		local f=$test_path/$tfile
+		pool_remove_all_targets $POOL $f	|| { rc=$? ; break; }
+		pool_remove $POOL $f 			|| { rc=$? ; break; }
+		break
+	done
+
+	cleanup_pools
+	return $rc
+}
+run_test 200 "OST pools"
 
 # usage: default_attr <count | size | offset>
 default_attr() {
 	$LCTL get_param -n lov.$FSNAME-clilov-\*.stripe${1}
 }
 
-# usage: trim <string>
-# Trims leading and trailing whitespace from the parameter string
-trim() {
-    echo $@
-}
-
-# usage: check_default_stripe_attr <count | size | offset>
+# usage: check_default_stripe_attr
 check_default_stripe_attr() {
-	# $GETSTRIPE returns trailing whitespace which needs to be trimmed off
-	ACTUAL=$(trim $($GETSTRIPE --$1 $DIR/$tdir))
-	if [ $1 = "count" -o $1 = "size" ]; then
-		EXPECTED=`default_attr $1`;
-	else
-		# the 'stripeoffset' parameter prints as an unsigned int, so
-		# until this is fixed we hard-code -1 here
-		EXPECTED=-1;
-	fi
-	[ "x$ACTUAL" != "x$EXPECTED" ] &&
-		error "$DIR/$tdir has stripe $1 '$ACTUAL', not '$EXPECTED'"
-}
+	ACTUAL=$($GETSTRIPE $* $DIR/$tdir)
+	case $1 in
+	--stripe-count|--count)
+		[ -n "$2" ] && EXPECTED=0 || EXPECTED=$(default_attr count);;
+	--stripe-size|--size)
+		[ -n "$2" ] && EXPECTED=0 || EXPECTED=$(default_attr size);;
+	--stripe-index|--index)
+		EXPECTED=-1;;
+	*)
+		error "unknown getstripe attr '$1'"
+	esac
 
-# usage: check_raw_stripe_attr <count | size | offset>
-check_raw_stripe_attr() {
-	# $GETSTRIPE returns trailing whitespace which needs to be trimmed off
-	ACTUAL=$(trim $($GETSTRIPE --raw --$1 $DIR/$tdir))
-	if [ $1 = "count" -o $1 = "size" ]; then
-		EXPECTED=0;
-	else
-		EXPECTED=-1;
-	fi
-	[ "x$ACTUAL" != "x$EXPECTED" ] &&
-		error "$DIR/$tdir has raw stripe $1 '$ACTUAL', not '$EXPECTED'"
+	[ $ACTUAL != $EXPECTED ] &&
+		error "$DIR/$tdir has $1 '$ACTUAL', not '$EXPECTED'"
 }
 
-
 test_204a() {
-	mkdir -p $DIR/$tdir
-	$SETSTRIPE --count 0 --size 0 --offset -1 $DIR/$tdir
+	test_mkdir -p $DIR/$tdir
+	$SETSTRIPE --stripe-count 0 --stripe-size 0 --stripe-index -1 $DIR/$tdir
 
-	check_default_stripe_attr count
-	check_default_stripe_attr size
-	check_default_stripe_attr offset
+	check_default_stripe_attr --stripe-count
+	check_default_stripe_attr --stripe-size
+	check_default_stripe_attr --stripe-index
 
 	return 0
 }
 run_test 204a "Print default stripe attributes ================="
 
 test_204b() {
-	mkdir -p $DIR/$tdir
-	$SETSTRIPE --count 1 $DIR/$tdir
+	test_mkdir -p $DIR/$tdir
+	$SETSTRIPE --stripe-count 1 $DIR/$tdir
 
-	check_default_stripe_attr size
-	check_default_stripe_attr offset
+	check_default_stripe_attr --stripe-size
+	check_default_stripe_attr --stripe-index
 
 	return 0
 }
 run_test 204b "Print default stripe size and offset  ==========="
 
 test_204c() {
-	mkdir -p $DIR/$tdir
-	$SETSTRIPE --size 65536 $DIR/$tdir
+	test_mkdir -p $DIR/$tdir
+	$SETSTRIPE --stripe-size 65536 $DIR/$tdir
 
-	check_default_stripe_attr count
-	check_default_stripe_attr offset
+	check_default_stripe_attr --stripe-count
+	check_default_stripe_attr --stripe-index
 
 	return 0
 }
 run_test 204c "Print default stripe count and offset ==========="
 
 test_204d() {
-	mkdir -p $DIR/$tdir
-	$SETSTRIPE --offset 0 $DIR/$tdir
+	test_mkdir -p $DIR/$tdir
+	$SETSTRIPE --stripe-index 0 $DIR/$tdir
 
-	check_default_stripe_attr count
-	check_default_stripe_attr size
+	check_default_stripe_attr --stripe-count
+	check_default_stripe_attr --stripe-size
 
 	return 0
 }
 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_raw_stripe_attr count
-	check_raw_stripe_attr size
-	check_raw_stripe_attr offset
+	check_default_stripe_attr --stripe-count --raw
+	check_default_stripe_attr --stripe-size --raw
+	check_default_stripe_attr --stripe-index --raw
 
 	return 0
 }
 run_test 204e "Print raw stripe attributes ================="
 
 test_204f() {
-	mkdir -p $DIR/$tdir
-	$SETSTRIPE --count 1 $DIR/$tdir
+	test_mkdir -p $DIR/$tdir
+	$SETSTRIPE --stripe-count 1 $DIR/$tdir
 
-	check_raw_stripe_attr size
-	check_raw_stripe_attr offset
+	check_default_stripe_attr --stripe-size --raw
+	check_default_stripe_attr --stripe-index --raw
 
 	return 0
 }
 run_test 204f "Print raw stripe size and offset  ==========="
 
 test_204g() {
-	mkdir -p $DIR/$tdir
-	$SETSTRIPE --size 65536 $DIR/$tdir
+	test_mkdir -p $DIR/$tdir
+	$SETSTRIPE --stripe-size 65536 $DIR/$tdir
 
-	check_raw_stripe_attr count
-	check_raw_stripe_attr offset
+	check_default_stripe_attr --stripe-count --raw
+	check_default_stripe_attr --stripe-index --raw
 
 	return 0
 }
 run_test 204g "Print raw stripe count and offset ==========="
 
 test_204h() {
-	mkdir -p $DIR/$tdir
-	$SETSTRIPE --offset 0 $DIR/$tdir
+	test_mkdir -p $DIR/$tdir
+	$SETSTRIPE --stripe-index 0 $DIR/$tdir
 
-	check_raw_stripe_attr count
-	check_raw_stripe_attr size
+	check_default_stripe_attr --stripe-count --raw
+	check_default_stripe_attr --stripe-size --raw
 
 	return 0
 }
 run_test 204h "Print raw stripe count and size ============="
 
+# Figure out which job scheduler is being used, if any,
+# or use a fake one
+if [ -n "$SLURM_JOB_ID" ]; then # SLURM
+	JOBENV=SLURM_JOB_ID
+elif [ -n "$LSB_JOBID" ]; then # Load Sharing Facility
+	JOBENV=LSB_JOBID
+elif [ -n "$PBS_JOBID" ]; then # PBS/Maui/Moab
+	JOBENV=PBS_JOBID
+elif [ -n "$LOADL_STEPID" ]; then # LoadLeveller
+	JOBENV=LOADL_STEP_ID
+elif [ -n "$JOB_ID" ]; then # Sun Grid Engine
+	JOBENV=JOB_ID
+else
+	JOBENV=FAKE_JOBID
+fi
+
+verify_jobstats() {
+	local cmd=$1
+	local target=$2
+
+	# clear old jobstats
+	do_facet $SINGLEMDS lctl set_param mdt.*.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
+
+	JOBVAL=${!JOBENV}
+	log "Test: $cmd"
+	log "Using JobID environment variable $JOBENV=$JOBVAL"
+
+	if [ $JOBENV = "FAKE_JOBID" ]; then
+		FAKE_JOBID=$JOBVAL $cmd
+	else
+		$cmd
+	fi
+
+	if [ "$target" = "mdt" -o "$target" = "both" ]; then
+		FACET="$SINGLEMDS" # will need to get MDS number for DNE
+		do_facet $FACET lctl get_param mdt.*.job_stats |
+			grep $JOBVAL || error "No job stats found on MDT $FACET"
+	fi
+	if [ "$target" = "ost" -o "$target" = "both" ]; then
+		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
+	[ -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
+		do_facet mgs $LCTL conf_param $FSNAME.sys.jobid_var=$JOBENV
+		wait_update $HOSTNAME "$LCTL get_param -n jobid_var" \
+			$JOBENV || return 1
+	fi
+
+	# mkdir
+	cmd="mkdir $DIR/$tfile"
+	verify_jobstats "$cmd" "mdt"
+	# rmdir
+	cmd="rm -fr $DIR/$tfile"
+	verify_jobstats "$cmd" "mdt"
+	# mknod
+	cmd="mknod $DIR/$tfile c 1 3"
+	verify_jobstats "$cmd" "mdt"
+	# unlink
+	cmd="rm -f $DIR/$tfile"
+	verify_jobstats "$cmd" "mdt"
+	# open & close
+	cmd="$SETSTRIPE -i 0 -c 1 $DIR/$tfile"
+	verify_jobstats "$cmd" "mdt"
+	# setattr
+	cmd="touch $DIR/$tfile"
+	verify_jobstats "$cmd" "both"
+	# write
+	cmd="dd if=/dev/zero of=$DIR/$tfile bs=1M count=1 oflag=sync"
+	verify_jobstats "$cmd" "ost"
+	# read
+	cmd="dd if=$DIR/$tfile of=/dev/null bs=1M count=1 iflag=direct"
+	verify_jobstats "$cmd" "ost"
+	# truncate
+	cmd="$TRUNCATE $DIR/$tfile 0"
+	verify_jobstats "$cmd" "both"
+	# rename
+	cmd="mv -f $DIR/$tfile $DIR/jobstats_test_rename"
+	verify_jobstats "$cmd" "mdt"
+
+	# cleanup
+	rm -f $DIR/jobstats_test_rename
+
+	if [ $OLD_JOBENV != $JOBENV ]; then
+		do_facet mgs $LCTL conf_param $FSNAME.sys.jobid_var=$OLD_JOBENV
+		wait_update $HOSTNAME "$LCTL get_param -n jobid_var" \
+			$OLD_JOBENV || return 1
+	fi
+}
+run_test 205 "Verify job stats"
+
+# LU-1480, LU-1773 and LU-1657
+test_206() {
+	mkdir -p $DIR/$tdir
+	lfs setstripe -c -1 $DIR/$tdir
+#define OBD_FAIL_LOV_INIT 0x1403
+	$LCTL set_param fail_loc=0xa0001403
+	$LCTL set_param fail_val=1
+	touch $DIR/$tdir/$tfile || true
+}
+run_test 206 "fail lov_init_raid0() doesn't lbug"
+
 test_212() {
 	size=`date +%s`
 	size=$((size % 8192 + 1))
@@ -8251,7 +9552,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
@@ -8309,12 +9610,12 @@ check_lnet_proc_entry() {
 }
 
 test_215() { # for bugs 18102, 21079, 21517
-	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]*)' # any numeric (0 | >0 | <0)
-	local NET='[a-z][a-z0-9]*'  # LNET net like o2ib2
-	local ADDR='[0-9.]+'        # LNET addr like 10.0.0.1
-	local NID="$ADDR@$NET"      # LNET nid like 10.0.0.1@o2ib2
+	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
+	local NET='[a-z][a-z0-9]*'      # LNET net like o2ib2
+	local ADDR='[0-9.]+'            # LNET addr like 10.0.0.1
+	local NID="$ADDR@$NET"          # LNET nid like 10.0.0.1@o2ib2
 
 	local L1 # regexp for 1st line
 	local L2 # regexp for 2nd line (optional)
@@ -8377,10 +9678,10 @@ test_215() { # for bugs 18102, 21079, 21517
 	# /proc/sys/lnet/nis should look like this:
 	# nid status alive refs peer rtr max tx min
 	# where nid is a string like 192.168.1.1@tcp2, status is up/down,
-	# alive is numeric (0 or >0 or <0), refs > 0, peer >= 0,
+	# alive is numeric (0 or >0 or <0), refs >= 0, peer >= 0,
 	# rtr >= 0, max >=0, tx and min are numeric (0 or >0 or <0).
 	L1="^nid +status +alive +refs +peer +rtr +max +tx +min$"
-	BR="^$NID +(up|down) +$I +$P +$N +$N +$N +$I +$I$"
+	BR="^$NID +(up|down) +$I +$N +$N +$N +$N +$I +$I$"
 	create_lnet_proc_files "nis"
 	check_lnet_proc_entry "nis.out" "/proc/sys/lnet/nis" "$BR" "$L1"
 	check_lnet_proc_entry "nis.sys" "lnet.nis" "$BR" "$L1"
@@ -8448,11 +9749,11 @@ run_test 217 "check lctl ping for hostnames with hiphen ('-')"
 test_218() {
        # do directio so as not to populate the page cache
        log "creating a 10 Mb file"
-       multiop $DIR/$tfile oO_CREAT:O_DIRECT:O_RDWR:w$((10*1048576))c || error "multiop failed while creating a file"
+       $MULTIOP $DIR/$tfile oO_CREAT:O_DIRECT:O_RDWR:w$((10*1048576))c || error "multiop failed while creating a file"
        log "starting reads"
        dd if=$DIR/$tfile of=/dev/null bs=4096 &
        log "truncating the file"
-       multiop $DIR/$tfile oO_TRUNC:c || error "multiop failed while truncating the file"
+       $MULTIOP $DIR/$tfile oO_TRUNC:c || error "multiop failed while truncating the file"
        log "killing dd"
        kill %+ || true # reads might have finished
        echo "wait until dd is finished"
@@ -8481,7 +9782,7 @@ test_220() { #LU-325
 	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$//')
 
@@ -8532,7 +9833,8 @@ test_220() { #LU-325
 run_test 220 "preallocated MDS objects still used if ENOSPC from OST"
 
 test_221() {
-        cp `which date` $MOUNT
+        dd if=`which date` of=$MOUNT/date oflag=sync
+        chmod +x $MOUNT/date
 
         #define OBD_FAIL_LLITE_FAULT_TRUNC_RACE  0x1401
         $LCTL set_param fail_loc=0x80001401
@@ -8544,8 +9846,8 @@ run_test 221 "make sure fault and truncate race to not cause OOM"
 
 test_222a () {
        rm -rf $DIR/$tdir
-       mkdir -p $DIR/$tdir
-       $LFS setstripe -c 1 -i 0 $DIR/$tdir
+       test_mkdir -p $DIR/$tdir
+       $SETSTRIPE -c 1 -i 0 $DIR/$tdir
        createmany -o $DIR/$tdir/$tfile 10
        cancel_lru_locks mdc
        cancel_lru_locks osc
@@ -8559,8 +9861,8 @@ run_test 222a "AGL for ls should not trigger CLIO lock failure ================"
 
 test_222b () {
        rm -rf $DIR/$tdir
-       mkdir -p $DIR/$tdir
-       $LFS setstripe -c 1 -i 0 $DIR/$tdir
+       test_mkdir -p $DIR/$tdir
+       $SETSTRIPE -c 1 -i 0 $DIR/$tdir
        createmany -o $DIR/$tdir/$tfile 10
        cancel_lru_locks mdc
        cancel_lru_locks osc
@@ -8573,8 +9875,8 @@ run_test 222b "AGL for rmdir should not trigger CLIO lock failure ============="
 
 test_223 () {
        rm -rf $DIR/$tdir
-       mkdir -p $DIR/$tdir
-       $LFS setstripe -c 1 -i 0 $DIR/$tdir
+       test_mkdir -p $DIR/$tdir
+       $SETSTRIPE -c 1 -i 0 $DIR/$tdir
        createmany -o $DIR/$tdir/$tfile 10
        cancel_lru_locks mdc
        cancel_lru_locks osc
@@ -8606,6 +9908,286 @@ test_224b() { # LU-1039, MRP-303
 }
 run_test 224b "Don't panic on bulk IO failure"
 
+MDSSURVEY=${MDSSURVEY:-$(which mds-survey 2>/dev/null || true)}
+test_225a () {
+       if [ -z ${MDSSURVEY} ]; then
+              skip_env "mds-survey not found" && return
+       fi
+       [ $(lustre_version_code $SINGLEMDS) -ge $(version_code 2.2.51) ] ||
+            { skip "Need MDS version at least 2.2.51"; return; }
+
+       local mds=$(facet_host $SINGLEMDS)
+       local target=$(do_nodes $mds 'lctl dl' | \
+                      awk "{if (\$2 == \"UP\" && \$3 == \"mdt\") {print \$4}}")
+
+       local cmd1="file_count=1000 thrhi=4"
+       local cmd2="dir_count=2 layer=mdd stripe_count=0"
+       local cmd3="rslt_loc=${TMP} targets=\"$mds:$target\" $MDSSURVEY"
+       local cmd="$cmd1 $cmd2 $cmd3"
+
+       rm -f ${TMP}/mds_survey*
+       echo + $cmd
+       eval $cmd || error "mds-survey with zero-stripe failed"
+       cat ${TMP}/mds_survey*
+       rm -f ${TMP}/mds_survey*
+}
+run_test 225a "Metadata survey sanity with zero-stripe"
+
+test_225b () {
+       if [ -z ${MDSSURVEY} ]; then
+              skip_env "mds-survey not found" && return
+       fi
+       [ $(lustre_version_code $SINGLEMDS) -ge $(version_code 2.2.51) ] ||
+            { skip "Need MDS version at least 2.2.51"; return; }
+
+       if [ $($LCTL dl | grep -c osc) -eq 0 ]; then
+              skip_env "Need to mount OST to test" && return
+       fi
+
+       local mds=$(facet_host $SINGLEMDS)
+       local target=$(do_nodes $mds 'lctl dl' | \
+                      awk "{if (\$2 == \"UP\" && \$3 == \"mdt\") {print \$4}}")
+
+       local cmd1="file_count=1000 thrhi=4"
+       local cmd2="dir_count=2 layer=mdd stripe_count=1"
+       local cmd3="rslt_loc=${TMP} targets=\"$mds:$target\" $MDSSURVEY"
+       local cmd="$cmd1 $cmd2 $cmd3"
+
+       rm -f ${TMP}/mds_survey*
+       echo + $cmd
+       eval $cmd || error "mds-survey with stripe_count failed"
+       cat ${TMP}/mds_survey*
+       rm -f ${TMP}/mds_survey*
+}
+run_test 225b "Metadata survey sanity with stripe_count = 1"
+
+mcreate_path2fid () {
+	local mode=$1
+	local major=$2
+	local minor=$3
+	local name=$4
+	local desc=$5
+	local path=$DIR/$tdir/$name
+	local fid
+	local rc
+	local fid_path
+
+	$MCREATE --mode=$1 --major=$2 --minor=$3 $path ||
+		error "cannot create $desc"
+
+	fid=$($LFS path2fid $path)
+	rc=$?
+	[ $rc -ne 0 ] && error "cannot get fid of a $desc"
+
+	fid_path=$($LFS fid2path $DIR "$fid")
+	rc=$?
+	[ $rc -ne 0 ] && error "cannot get path of $desc by $DIR $path $fid"
+
+	[ "$path" == "$fid_path" ] ||
+		error "fid2path returned $fid_path, expected $path"
+
+	echo "pass with $path and $fid"
+}
+
+test_226 () {
+	rm -rf $DIR/$tdir
+	mkdir -p $DIR/$tdir
+
+	mcreate_path2fid 0010666 0 0 fifo "FIFO"
+	mcreate_path2fid 0020666 1 3 null "character special file (null)"
+	mcreate_path2fid 0020666 1 255 none "character special file (no device)"
+	mcreate_path2fid 0040666 0 0 dir "directory"
+	mcreate_path2fid 0060666 7 0 loop0 "block special file (loop)"
+	mcreate_path2fid 0100666 0 0 file "regular file"
+	mcreate_path2fid 0120666 0 0 link "symbolic link"
+	mcreate_path2fid 0140666 0 0 sock "socket"
+}
+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() {
+	dd if=`which date` of=$MOUNT/date bs=1k count=1
+	chmod +x $MOUNT/date
+
+	$MOUNT/date > /dev/null
+	ldd $MOUNT/date > /dev/null
+	rm -f $MOUNT/date
+}
+run_test 227 "running truncated executable does not cause OOM"
+
+# LU-1512 try to reuse idle OI blocks
+test_228a() {
+	[ "$(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() {
+	[ "$(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
+
+	# 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
+	# 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 228b "idle OI blocks can be reused after MDT restart"
+
+#LU-1881
+test_228c() {
+	[ "$(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() {
+	[ $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() {
+	[ $MDSCOUNT -lt 2 ] && skip "needs >= 2 MDTs" && 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"
+
+	$LFS mkdir -i 0 $remote_dir/new_dir &&
+		error "nested remote directory create succeed!"
+
+	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
 #
@@ -8618,12 +10200,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