X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Fsanity.sh;h=0cff0fb882328a42de47d927ff1b507ada362179;hb=02f94f58f3eed8987efc99825d9f127af730387b;hp=e3e4f1460ceb5afaad303e8400d958c9d850f9fa;hpb=de3c3fdf2597ba110a5247e271470b5dd626df75;p=fs%2Flustre-release.git

diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh
index e3e4f14..0cff0fb 100644
--- a/lustre/tests/sanity.sh
+++ b/lustre/tests/sanity.sh
@@ -7,8 +7,8 @@
 set -e
 
 ONLY=${ONLY:-"$*"}
-# bug number for skipped test: 2108 9789 3637 9789 3561 12622 12653 12653 5188 10764 16260
-ALWAYS_EXCEPT="                42a  42b  42c  42d  45   51d   65a   65e   68   75    119d  $SANITY_EXCEPT"
+# bug number for skipped test: 13297 2108 9789 3637 9789 3561 12622 12653 12653 5188 10764 16260
+ALWAYS_EXCEPT="                27u   42a  42b  42c  42d  45   51d   65a   65e   68   75    119d  $SANITY_EXCEPT"
 # bug number for skipped test: 2108 9789 3637 9789 3561 5188/5749 1443
 #ALWAYS_EXCEPT=${ALWAYS_EXCEPT:-"27m 42a 42b 42c 42d 45 68 76"}
 # UPDATE THE COMMENT ABOVE WITH BUG NUMBERS WHEN CHANGING ALWAYS_EXCEPT!
@@ -130,7 +130,7 @@ check_runas_id $RUNAS_ID $RUNAS
 
 build_test_filter
 
-if [ "${ONLY}" = "MOUNT" ] ; then 
+if [ "${ONLY}" = "MOUNT" ] ; then
 	echo "Lustre is up, please go on"
 	exit
 fi
@@ -159,6 +159,12 @@ test_0b() {
 }
 run_test 0b "chmod 0755 $DIR ============================="
 
+test_0c() {
+    $LCTL get_param mdc.*.import | grep  "state: FULL" || error "import not FULL"
+    $LCTL get_param mdc.*.import | grep  "target: $FSNAME-MDT" || error "bad target"
+}
+run_test 0c "check import proc ============================="
+
 test_1a() {
 	mkdir $DIR/d1
 	mkdir $DIR/d1/d2
@@ -458,6 +464,14 @@ test_17f() {
 }
 run_test 17f "symlinks: long and very long symlink name ========================"
 
+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
+}
+run_test 17g "symlinks: really long symlink name ==============================="
+
 test_18() {
 	touch $DIR/f
 	ls $DIR || error
@@ -571,7 +585,7 @@ test_24d() {
 run_test 24d "mkdir .../R4/{f,g}; rename .../R4/f .../R4/g ====="
 
 test_24e() {
-	echo '-- cross directory renames --' 
+	echo '-- cross directory renames --'
 	mkdir $DIR/R5{a,b}
 	touch $DIR/R5a/f
 	mv $DIR/R5a/f $DIR/R5b/g
@@ -626,7 +640,7 @@ test_24j() {
 	$CHECKSTAT -a $DIR/R10/f || error
 	$CHECKSTAT -a $DIR/R10/g || error
 }
-run_test 24j "source does not exist ============================" 
+run_test 24j "source does not exist ============================"
 
 test_24k() {
 	mkdir $DIR/R11a $DIR/R11a/d
@@ -823,7 +837,7 @@ run_test 27c "create two stripe file f01 ======================="
 
 test_27d() {
 	mkdir -p $DIR/d27
-	$SETSTRIPE $DIR/d27/fdef 0 -1 0 || error "lstripe failed"
+	$SETSTRIPE -c0 -i-1 -s0 $DIR/d27/fdef || error "lstripe failed"
 	$CHECKSTAT -t file $DIR/d27/fdef || error "checkstat failed"
 	dd if=/dev/zero of=$DIR/d27/fdef bs=4k count=4 || error
 }
@@ -919,25 +933,25 @@ reset_enospc() {
 	[ "$1" ] && FAIL_LOC=$1 || FAIL_LOC=0
 	mkdir -p $DIR/d27/nospc
 	rmdir $DIR/d27/nospc
-	lctl set_param fail_loc=$FAIL_LOC
+	do_nodes $(comma_list $(osts_nodes)) lctl set_param fail_loc=$FAIL_LOC
 }
 
 exhaust_precreations() {
 	OSTIDX=$1
-	OST=$(lctl get_param -n lov.${LOVNAME}.target_obd |
-              grep ${OSTIDX}": " | \
-              awk '{print $2}' | sed -e 's/_UUID$//')
+
+	OST=$(lfs osts | grep ${OSTIDX}": " | \
+	    awk '{print $2}' | sed -e 's/_UUID$//')
 	# on the mdt's osc
-        last_id=$(lctl get_param -n osc.*${OST}-osc-MDT0000.prealloc_last_id)
-	next_id=$(lctl get_param -n osc.*${OST}-osc-MDT0000.prealloc_next_id)
+	last_id=$(do_facet $SINGLEMDS lctl get_param -n osc.*${OST}-osc-MDT0000.prealloc_last_id)
+	next_id=$(do_facet $SINGLEMDS lctl get_param -n osc.*${OST}-osc-MDT0000.prealloc_next_id)
 
-        mkdir -p $DIR/d27/${OST}
+	mkdir -p $DIR/d27/${OST}
 	$SETSTRIPE $DIR/d27/${OST} -i $OSTIDX -c 1
 #define OBD_FAIL_OST_ENOSPC              0x215
-	lctl set_param fail_loc=0x215
+	do_facet ost$((OSTIDX + 1)) lctl set_param fail_loc=0x215
 	echo "Creating to objid $last_id on ost $OST..."
 	createmany -o $DIR/d27/${OST}/f $next_id $((last_id - next_id + 2))
-	lctl get_param -n osc.*${OST}-osc-MDT0000.prealloc* | grep '[0-9]'
+	do_facet $SINGLEMDS lctl get_param -n osc.*${OST}-osc-MDT0000.prealloc* | grep '[0-9]'
 	reset_enospc $2
 }
 
@@ -951,7 +965,8 @@ exhaust_all_precreations() {
 
 test_27n() {
 	[ "$OSTCOUNT" -lt "2" ] && skip "too few OSTs" && return
-	remote_mds && skip "remote MDS" && return
+	remote_mds_nodsh && skip "remote MDS with nodsh" && return
+	remote_ost_nodsh && skip "remote OST with nodsh" && return
 
 	reset_enospc
 	rm -f $DIR/d27/f27n
@@ -965,7 +980,8 @@ run_test 27n "create file with some full OSTs =================="
 
 test_27o() {
 	[ "$OSTCOUNT" -lt "2" ] && skip "too few OSTs" && return
-	remote_mds && skip "remote MDS" && return
+	remote_mds_nodsh && skip "remote MDS with nodsh" && return
+	remote_ost_nodsh && skip "remote OST with nodsh" && return
 
 	reset_enospc
 	rm -f $DIR/d27/f27o
@@ -981,7 +997,8 @@ run_test 27o "create file with all full OSTs (should error) ===="
 
 test_27p() {
 	[ "$OSTCOUNT" -lt "2" ] && skip "too few OSTs" && return
-	remote_mds && skip "remote MDS" && return
+	remote_mds_nodsh && skip "remote MDS with nodsh" && return
+	remote_ost_nodsh && skip "remote OST with nodsh" && return
 
 	reset_enospc
 	rm -f $DIR/d27/f27p
@@ -1000,7 +1017,8 @@ run_test 27p "append to a truncated file with some full OSTs ==="
 
 test_27q() {
 	[ "$OSTCOUNT" -lt "2" ] && skip "too few OSTs" && return
-	remote_mds && skip "remote MDS" && return
+	remote_mds_nodsh && skip "remote MDS with nodsh" && return
+	remote_ost_nodsh && skip "remote OST with nodsh" && return
 
 	reset_enospc
 	rm -f $DIR/d27/f27q
@@ -1020,7 +1038,8 @@ run_test 27q "append to truncated file with all OSTs full (should error) ==="
 
 test_27r() {
 	[ "$OSTCOUNT" -lt "2" ] && skip "too few OSTs" && return
-	remote_mds && skip "remote MDS" && return
+	remote_mds_nodsh && skip "remote MDS with nodsh" && return
+	remote_ost_nodsh && skip "remote OST with nodsh" && return
 
 	reset_enospc
 	rm -f $DIR/d27/f27r
@@ -1050,18 +1069,18 @@ test_27t() { # bug 10864
 run_test 27t "check that utils parse path correctly"
 
 test_27u() { # bug 4900
-	[ "$OSTCOUNT" -lt "2" ] && skip "too few OSTs" && return
-	remote_mds && skip "remote MDS" && return
+        [ "$OSTCOUNT" -lt "2" ] && skip "too few OSTs" && return
+        remote_mds_nodsh && skip "remote MDS with nodsh" && return
 
         #define OBD_FAIL_MDS_OSC_PRECREATE      0x13d
 
-        lctl set_param fail_loc=0x13d
+        do_facet $SINGLEMDS lctl set_param fail_loc=0x13d
         mkdir -p $DIR/d27u
         createmany -o $DIR/d27u/t- 1000
-        lctl set_param fail_loc=0
+        do_facet $SINGLEMDS lctl set_param fail_loc=0
 
         TLOG=$DIR/$tfile.getstripe
-        $GETSTRIPE $DIR/d27u > $TLOG 
+        $GETSTRIPE $DIR/d27u > $TLOG
         OBJS=`awk -vobj=0 '($1 == 0) { obj += 1 } END { print obj;}' $TLOG`
         unlinkmany $DIR/d27u/t- 1000
         [ $OBJS -gt 0 ] && \
@@ -1071,7 +1090,8 @@ run_test 27u "skip object creation on OSC w/o objects =========="
 
 test_27v() { # bug 4900
 	[ "$OSTCOUNT" -lt "2" ] && skip "too few OSTs" && return
-	remote_mds && skip "remote MDS" && return
+	remote_mds_nodsh && skip "remote MDS with nodsh" && return
+	remote_ost_nodsh && skip "remote OST with nodsh" && return
 
         exhaust_all_precreations
 
@@ -1126,14 +1146,32 @@ test_29() {
 	touch $DIR/d29/foo
 	log 'first d29'
 	ls -l $DIR/d29
-	LOCKCOUNTORIG=`lctl get_param -n ldlm.namespaces.*mdc*.lock_count`
-	LOCKUNUSEDCOUNTORIG=`lctl get_param -n ldlm.namespaces.*mdc*.lock_unused_count`
-	[ -z $"LOCKCOUNTORIG" ] && echo "No mdc lock count" && return 1
+
+	declare -i LOCKCOUNTORIG=0
+	for lock_count in $(lctl get_param -n ldlm.namespaces.*mdc*.lock_count); do
+		let LOCKCOUNTORIG=$LOCKCOUNTORIG+$lock_count
+	done
+	[ $LOCKCOUNTORIG -eq 0 ] && echo "No mdc lock count" && return 1
+
+	declare -i LOCKUNUSEDCOUNTORIG=0
+	for unused_count in $(lctl get_param -n ldlm.namespaces.*mdc*.lock_unused_count); do
+		let LOCKUNUSEDCOUNTORIG=$LOCKUNUSEDCOUNTORIG+$unused_count
+	done
+
 	log 'second d29'
 	ls -l $DIR/d29
 	log 'done'
-	LOCKCOUNTCURRENT=`lctl get_param -n ldlm.namespaces.*mdc*.lock_count`
-	LOCKUNUSEDCOUNTCURRENT=`lctl get_param -n ldlm.namespaces.*mdc*.lock_unused_count`
+
+	declare -i LOCKCOUNTCURRENT=0
+	for lock_count in $(lctl get_param -n ldlm.namespaces.*mdc*.lock_count); do
+		let LOCKCOUNTCURRENT=$LOCKCOUNTCURRENT+$lock_count
+	done
+
+	declare -i LOCKUNUSEDCOUNTCURRENT=0
+	for unused_count in $(lctl get_param -n ldlm.namespaces.*mdc*.lock_unused_count); do
+		let LOCKUNUSEDCOUNTCURRENT=$LOCKUNUSEDCOUNTCURRENT+$unused_count
+	done
+
 	if [ "$LOCKCOUNTCURRENT" -gt "$LOCKCOUNTORIG" ]; then
 		lctl set_param -n ldlm.dump_namespaces ""
 		error "CURRENT: $LOCKCOUNTCURRENT > $LOCKCOUNTORIG"
@@ -1308,27 +1346,27 @@ run_test 31m "link to file: the same, non-existing, dir==============="
 test_32a() {
 	echo "== more mountpoints and symlinks ================="
 	[ -e $DIR/d32a ] && rm -fr $DIR/d32a
-	mkdir -p $DIR/d32a/ext2-mountpoint 
+	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  
+	$CHECKSTAT -t dir $DIR/d32a/ext2-mountpoint/.. || error
 	$UMOUNT $DIR/d32a/ext2-mountpoint || error
 }
 run_test 32a "stat d32a/ext2-mountpoint/.. ====================="
 
 test_32b() {
 	[ -e $DIR/d32b ] && rm -fr $DIR/d32b
-	mkdir -p $DIR/d32b/ext2-mountpoint 
+	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
 }
 run_test 32b "open d32b/ext2-mountpoint/.. ====================="
- 
+
 test_32c() {
 	[ -e $DIR/d32c ] && rm -fr $DIR/d32c
-	mkdir -p $DIR/d32c/ext2-mountpoint 
+	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    
+	mkdir -p $DIR/d32c/d2/test_dir
 	$CHECKSTAT -t dir $DIR/d32c/ext2-mountpoint/../d2/test_dir || error
 	$UMOUNT $DIR/d32c/ext2-mountpoint || error
 }
@@ -1336,9 +1374,9 @@ 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 
+	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    
+	mkdir -p $DIR/d32d/d2/test_dir
 	ls -al $DIR/d32d/ext2-mountpoint/../d2/test_dir || error
 	$UMOUNT $DIR/d32d/ext2-mountpoint || error
 }
@@ -1346,10 +1384,10 @@ run_test 32d "open d32d/ext2-mountpoint/../d2/test_dir ========="
 
 test_32e() {
 	[ -e $DIR/d32e ] && rm -fr $DIR/d32e
-	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 
+	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
 	$CHECKSTAT -t link $DIR/d32e/tmp/symlink11 || error
 	$CHECKSTAT -t link $DIR/d32e/symlink01 || error
 }
@@ -1357,20 +1395,20 @@ run_test 32e "stat d32e/symlink->tmp/symlink->lustre-subdir ===="
 
 test_32f() {
 	[ -e $DIR/d32f ] && rm -fr $DIR/d32f
-	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 
+	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
 	ls $DIR/d32f/tmp/symlink11  || error
 	ls $DIR/d32f/symlink01 || error
 }
 run_test 32f "open d32f/symlink->tmp/symlink->lustre-subdir ===="
 
 test_32g() {
-	TMP_DIR=$DIR/$tdir/tmp       
+	TMP_DIR=$DIR/$tdir/tmp
 	mkdir -p $TMP_DIR $DIR/${tdir}2
-	ln -s $DIR/${tdir}2 $TMP_DIR/symlink12 
-	ln -s $TMP_DIR/symlink12 $TMP_DIR/../symlink02 
+	ln -s $DIR/${tdir}2 $TMP_DIR/symlink12
+	ln -s $TMP_DIR/symlink12 $TMP_DIR/../symlink02
 	$CHECKSTAT -t link $TMP_DIR/symlink12 || error
 	$CHECKSTAT -t link $DIR/$tdir/symlink02 || error
 	$CHECKSTAT -t dir -f $TMP_DIR/symlink12 || error
@@ -1380,10 +1418,10 @@ 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 
-	ln -s $DIR/${tdir}2 $TMP_DIR/symlink12 
-	ln -s $TMP_DIR/symlink12 $TMP_DIR/../symlink02 
+	TMP_DIR=$DIR/$tdir/tmp
+	mkdir -p $TMP_DIR $DIR/${tdir}2
+	ln -s $DIR/${tdir}2 $TMP_DIR/symlink12
+	ln -s $TMP_DIR/symlink12 $TMP_DIR/../symlink02
 	ls $TMP_DIR/symlink12 || error
 	ls $DIR/$tdir/symlink02  || error
 }
@@ -1391,17 +1429,17 @@ 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 
+	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  
+	$CHECKSTAT -t file $DIR/d32i/ext2-mountpoint/../test_file || error
 	$UMOUNT $DIR/d32i/ext2-mountpoint || error
 }
 run_test 32i "stat d32i/ext2-mountpoint/../test_file ==========="
 
 test_32j() {
 	[ -e $DIR/d32j ] && rm -fr $DIR/d32j
-	mkdir -p $DIR/d32j/ext2-mountpoint 
+	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
@@ -1411,8 +1449,8 @@ 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/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
@@ -1422,7 +1460,7 @@ run_test 32k "stat d32k/ext2-mountpoint/../d2/test_file ========"
 
 test_32l() {
 	rm -fr $DIR/d32l
-	mkdir -p $DIR/d32l/ext2-mountpoint 
+	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
@@ -1433,10 +1471,10 @@ run_test 32l "open d32l/ext2-mountpoint/../d2/test_file ========"
 
 test_32m() {
 	rm -fr $DIR/d32m
-	mkdir -p $DIR/d32m/tmp    
-	TMP_DIR=$DIR/d32m/tmp       
-	ln -s $DIR $TMP_DIR/symlink11 
-	ln -s $TMP_DIR/symlink11 $TMP_DIR/../symlink01 
+	mkdir -p $DIR/d32m/tmp
+	TMP_DIR=$DIR/d32m/tmp
+	ln -s $DIR $TMP_DIR/symlink11
+	ln -s $TMP_DIR/symlink11 $TMP_DIR/../symlink01
 	$CHECKSTAT -t link $DIR/d32m/tmp/symlink11 || error
 	$CHECKSTAT -t link $DIR/d32m/symlink01 || error
 }
@@ -1444,10 +1482,10 @@ run_test 32m "stat d32m/symlink->tmp/symlink->lustre-root ======"
 
 test_32n() {
 	rm -fr $DIR/d32n
-	mkdir -p $DIR/d32n/tmp    
-	TMP_DIR=$DIR/d32n/tmp       
-	ln -s $DIR $TMP_DIR/symlink11 
-	ln -s $TMP_DIR/symlink11 $TMP_DIR/../symlink01 
+	mkdir -p $DIR/d32n/tmp
+	TMP_DIR=$DIR/d32n/tmp
+	ln -s $DIR $TMP_DIR/symlink11
+	ln -s $TMP_DIR/symlink11 $TMP_DIR/../symlink01
 	ls -l $DIR/d32n/tmp/symlink11  || error
 	ls -l $DIR/d32n/symlink01 || error
 }
@@ -1455,11 +1493,11 @@ 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    
-	TMP_DIR=$DIR/d32o/tmp       
-	ln -s $DIR/$tfile $TMP_DIR/symlink12 
-	ln -s $TMP_DIR/symlink12 $TMP_DIR/../symlink02 
+	touch $DIR/$tfile
+	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
 	$CHECKSTAT -t link $DIR/d32o/tmp/symlink12 || error
 	$CHECKSTAT -t link $DIR/d32o/symlink02 || error
 	$CHECKSTAT -t file -f $DIR/d32o/tmp/symlink12 || error
@@ -1473,15 +1511,15 @@ test_32p() {
     log 32p_2
 	rm -f $DIR/$tfile
     log 32p_3
-	touch $DIR/$tfile 
+	touch $DIR/$tfile
     log 32p_4
-	mkdir -p $DIR/d32p/tmp    
+	mkdir -p $DIR/d32p/tmp
     log 32p_5
-	TMP_DIR=$DIR/d32p/tmp       
+	TMP_DIR=$DIR/d32p/tmp
     log 32p_6
-	ln -s $DIR/$tfile $TMP_DIR/symlink12 
+	ln -s $DIR/$tfile $TMP_DIR/symlink12
     log 32p_7
-	ln -s $TMP_DIR/symlink12 $TMP_DIR/../symlink02 
+	ln -s $TMP_DIR/symlink12 $TMP_DIR/../symlink02
     log 32p_8
 	cat $DIR/d32p/tmp/symlink12 || error
     log 32p_9
@@ -1560,7 +1598,7 @@ test_34b() {
 run_test 34b "O_RDONLY opening file doesn't create objects ====="
 
 test_34c() {
-	[ ! -f $DIR/f34 ] && test_34a 
+	[ ! -f $DIR/f34 ] && test_34a
 	$CHECKSTAT -s $TEST_34_SIZE $DIR/f34 || error
 	$OPENFILE -f O_RDWR $DIR/f34
 	$GETSTRIPE $DIR/f34 2>&1 | grep -q "no stripe info" && error
@@ -1569,7 +1607,7 @@ test_34c() {
 run_test 34c "O_RDWR opening file-with-size works =============="
 
 test_34d() {
-	[ ! -f $DIR/f34 ] && test_34a 
+	[ ! -f $DIR/f34 ] && test_34a
 	dd if=/dev/zero of=$DIR/f34 conv=notrunc bs=4k count=1 || error
 	$CHECKSTAT -s $TEST_34_SIZE $DIR/f34 || error
 	rm $DIR/f34
@@ -1670,10 +1708,12 @@ test_36f() {
 run_test 36f "utime on file racing with OST BRW write =========="
 
 test_36g() {
-	remote_ost && skip "remote OST" && return
+	remote_ost_nodsh && skip "remote OST with nodsh" && return
+
+	mkdir -p $DIR/$tdir
 	export FMD_MAX_AGE=`do_facet ost1 lctl get_param -n obdfilter.*.client_cache_seconds 2> /dev/null | head -n 1`
 	FMD_BEFORE="`awk '/ll_fmd_cache/ { print $2 }' /proc/slabinfo`"
-	touch $DIR/d36/$tfile
+	touch $DIR/$tdir/$tfile
 	sleep $((FMD_MAX_AGE + 12))
 	FMD_AFTER="`awk '/ll_fmd_cache/ { print $2 }' /proc/slabinfo`"
 	[ "$FMD_AFTER" -gt "$FMD_BEFORE" ] && \
@@ -2007,7 +2047,7 @@ page_size() {
 
 # in a 2 stripe file (lov.sh), page 1023 maps to page 511 in its object.  this
 # test tickles a bug where re-dirtying a page was failing to be mapped to the
-# objects offset and an assert hit when an rpc was built with 1023's mapped 
+# objects offset and an assert hit when an rpc was built with 1023's mapped
 # offset 511 and 511's raw 511 offset. it also found general redirtying bugs.
 test_46() {
 	f="$DIR/f46"
@@ -2180,6 +2220,57 @@ test_51b() {
 }
 run_test 51b "mkdir .../t-0 --- .../t-$NUMTEST ===================="
 
+test_51bb() {
+	[ $MDSCOUNT -lt 2 ] && skip "needs >= 2 MDTs" && return
+
+	local ndirs=${TEST51BB_NDIRS:-10}
+	local nfiles=${TEST51BB_NFILES:-100}
+
+	local numfree=`df -i -P $DIR | tail -n 1 | awk '{ print $4 }'`
+
+	[ $numfree -lt $(( ndirs * nfiles)) ] && \
+		nfiles=$(( numfree / ndirs - 10 ))
+
+	local dir=$DIR/d51bb
+	mkdir -p $dir
+	local savePOLICY=$(lctl get_param -n lmv.*.placement)
+	lctl set_param -n lmv.*.placement=CHAR
+
+	lfs df -i $dir
+	local IUSED=$(lfs df -i $dir | grep MDT | awk '{print $3}')
+	OLDUSED=($IUSED)
+
+	declare -a dirs
+	for ((i=0; i < $ndirs; i++)); do
+		dirs[i]=$dir/$RANDOM
+		echo Creating directory ${dirs[i]}
+		mkdir -p ${dirs[i]}
+		ls $dir
+		echo Creating $nfiles in dir ${dirs[i]} ...
+		echo "createmany -o ${dirs[i]}/$tfile- $nfiles"
+		createmany -o ${dirs[i]}/$tfile- $nfiles
+	done
+	ls $dir
+
+	sleep 1
+
+	IUSED=$(lfs df -i $dir | grep MDT | awk '{print $3}')
+	NEWUSED=($IUSED)
+
+	local rc=0
+	for ((i=0; i<${#NEWUSED[@]}; i++)); do
+		echo "mds $i: inodes count OLD ${OLDUSED[$i]} NEW ${NEWUSED[$i]}"
+		[ ${OLDUSED[$i]} -lt ${NEWUSED[$i]} ] || rc=$((rc + 1))
+	done
+	
+	lctl set_param -n lmv.*.placement=$savePOLICY
+
+	[ $rc -ne $MDSCOUNT ] || \
+		error "Objects/inodes are not distributed over all mds servers"
+}
+run_test 51bb "mkdir createmany CMD $MDSCOUNT  ===================="
+
+
 test_51c() {
 	[ ! -d $DIR/d51b ] && skip "$DIR/51b missing" && \
 		return
@@ -2206,7 +2297,7 @@ test_51d() {
 		error "OST $N has less objects vs OST $NLAST (${OBJS[$N]} < ${OBJS[$NLAST]}"
 	    [ ${OBJS[$N]} -gt $((${OBJS[$NLAST]} + 20)) ] && \
 		error "OST $N has less objects vs OST $NLAST (${OBJS[$N]} < ${OBJS[$NLAST]}"
-	    
+
 	    [ ${OBJS0[$N]} -lt $((${OBJS0[$NLAST]} - 20)) ] && \
 		error "OST $N has less #0 objects vs OST $NLAST (${OBJS0[$N]} < ${OBJS0[$NLAST]}"
 	    [ ${OBJS0[$N]} -gt $((${OBJS0[$NLAST]} + 20)) ] && \
@@ -2255,14 +2346,22 @@ test_52b() {
 run_test 52b "immutable flag test (should return errors) ======="
 
 test_53() {
-	remote_mds && skip "remote MDS" && return
+	remote_mds_nodsh && skip "remote MDS with nodsh" && return
+	remote_ost_nodsh && skip "remote OST with nodsh" && return
 
-	# only test MDT0000 
-        for value in `lctl get_param osc.*-osc-MDT0000.prealloc_last_id` ; do
+	local param
+	local ostname
+	local mds_last
+	local ost_last
+	local ostnum
+
+	# only test MDT0000
+        for value in $(do_facet $SINGLEMDS lctl get_param osc.*-osc-MDT0000.prealloc_last_id) ; do
                 param=`echo ${value[0]} | cut -d "=" -f1`
                 ostname=`echo $param | cut -d "." -f2 | cut -d - -f 1-2`
-                ost_last=`lctl get_param -n obdfilter.$ostname.last_id`
-                mds_last=`lctl get_param -n $param`
+                mds_last=$(do_facet $SINGLEMDS lctl get_param -n $param)
+                ostnum=$(echo $ostname | sed "s/${FSNAME}-OST//g" | awk '{print ($1+1)}' )
+                ost_last=$(do_facet ost$ostnum lctl get_param -n obdfilter.$ostname.last_id | head -n 1)
                 echo "$ostname.last_id=$ost_last ; MDS.last_id=$mds_last"
                 if [ $ost_last != $mds_last ]; then
                     error "$ostname.last_id=$ost_last ; MDS.last_id=$mds_last"
@@ -2284,7 +2383,7 @@ test_54b() {
 	f="$DIR/f54b"
 	mknod $f c 1 3
 	chmod 0666 $f
-	dd if=/dev/zero of=$f bs=`page_size` count=1 
+	dd if=/dev/zero of=$f bs=`page_size` count=1
 }
 run_test 54b "char device works in lustre ======================"
 
@@ -2306,7 +2405,7 @@ test_54c() {
 	tdir="$DIR/d54c"
 	loopdev="$DIR/loop54c"
 
-	find_loop_dev 
+	find_loop_dev
 	[ -z "$LOOPNUM" ] && echo "couldn't find empty loop device" && return
 	mknod $loopdev b 7 $LOOPNUM
 	echo "make a loop file system with $tfile on $loopdev ($LOOPNUM)..."
@@ -2612,12 +2711,13 @@ run_test 56q "check lfs find -gid and ! -gid ==============================="
 
 test_57a() {
 	# note test will not do anything if MDS is not local
-	remote_mds && skip "remote MDS" && return
+	remote_mds_nodsh && skip "remote MDS with nodsh" && return
+
 	local MNTDEV="osd.*MDT*.mntdev"
-	DEV=$(lctl get_param -n $MNTDEV)
-	[ -z "$DEV" ] && error "can't access $MNTDEV" 
-	for DEV in `lctl get_param -n $MNTDEV`; do
-		dumpe2fs -h $DEV > $TMP/t57a.dump || error "can't access $DEV"
+	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"
 		DEVISIZE=`awk '/Inode size:/ { print $3 }' $TMP/t57a.dump`
 		[ "$DEVISIZE" -gt 128 ] || error "inode size $DEVISIZE"
 		rm $TMP/t57a.dump
@@ -2639,7 +2739,7 @@ test_57b() {
 	$GETSTRIPE $FILE1 2>&1 | grep -q "no stripe" || error "$FILE1 has an EA"
 	$GETSTRIPE $FILEN 2>&1 | grep -q "no stripe" || error "$FILEN has an EA"
 
-	MDSFREE="`lctl get_param -n osd.*MDT*.kbytesfree 2> /dev/null`"
+	MDSFREE="`lctl get_param -n osd.*MDT0000.kbytesfree 2> /dev/null`"
 	MDCFREE="`lctl get_param -n mdc.*.kbytesfree | head -n 1`"
 	echo "opening files to create objects/EAs"
 	for FILE in `seq -f $DIR/d57b/f%g 1 $FILECOUNT`; do
@@ -2686,7 +2786,7 @@ TEST60_HEAD="test_60 run $RANDOM"
 test_60a() {
         [ ! -f run-llog.sh ] && skip "missing subtest run-llog.sh" && return
 	log "$TEST60_HEAD - from kernel mode"
-#	sh run-llog.sh
+	sh run-llog.sh
 }
 run_test 60a "llog sanity tests run from kernel module =========="
 
@@ -2707,9 +2807,9 @@ test_60b() { # bug 6411
 	[ $LLOG_COUNT -gt 50 ] && error "CDEBUG_LIMIT not limiting messages ($LLOG_COUNT)"|| true
 }
 run_test 60b "limit repeated messages from CERROR/CWARN ========"
- 
+
 test_60c() {
-	echo "create 5000 files" 
+	echo "create 5000 files"
 	createmany -o $DIR/f60c- 5000
 #define OBD_FAIL_MDS_LLOG_CREATE_FAILED  0x13c
 	lctl set_param fail_loc=0x8000013c
@@ -2859,7 +2959,7 @@ test_65e() {
 	touch $DIR/d65/f6
 	$LVERIFY $DIR/d65 $DIR/d65/f6 || error "lverify failed"
 }
-run_test 65e "directory setstripe 0 -1 0 ======================="
+run_test 65e "directory setstripe defaults ======================="
 
 test_65f() {
 	mkdir -p $DIR/d65f
@@ -2884,9 +2984,9 @@ test_65h() {
           "`$GETSTRIPE -v $DIR/d65/dd1 | grep "^count"`" ] || error "stripe info inherit failed"
 }
 run_test 65h "directory stripe info inherit ===================="
- 
+
 test_65i() { # bug6367
-        $SETSTRIPE $MOUNT -s 65536 -c -1 
+        $SETSTRIPE $MOUNT -s 65536 -c -1
 }
 run_test 65i "set non-default striping on root directory (bug 6367)="
 
@@ -2903,22 +3003,24 @@ run_test 65j "set default striping on root directory (bug 6367)="
 
 test_65k() { # bug11679
         [ "$OSTCOUNT" -lt 2 ] && skip "too few OSTs" && return
-        remote_mds_nodsh && skip "remote MDS" && return
+        remote_mds_nodsh && skip "remote MDS with nodsh" && return
 
         echo "Check OST status: "
-        MDS_OSCS=`do_facet mds lctl dl | awk '/[oO][sS][cC].*md[ts]/ { print $4 }'`
+        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 mds lctl --device %$OSC 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 mds lctl --device  %$INACTIVE_OSC 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 mds lctl get_param -n lov.*md*.target_obd |
-                                      grep $STRIPE_OST | awk -F: '{print $1}'`
+                        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=$?
@@ -2926,7 +3028,7 @@ test_65k() { # bug11679
                 done
                 do_facet client rm -f $DIR/$tdir/*
                 echo $INACTIVE_OSC "is Activate."
-                do_facet mds lctl --device  %$INACTIVE_OSC activate
+                do_facet $SINGLEMDS lctl --device  %$INACTIVE_OSC activate
         done
 }
 run_test 65k "validate manual striping works properly with deactivated OSCs"
@@ -3010,61 +3112,40 @@ run_test 68 "support swapping to Lustre ========================"
 # bug5265, obdfilter oa2dentry return -ENOENT
 # #define OBD_FAIL_OST_ENOENT 0x217
 test_69() {
-	[ $(lctl get_param -n devices | grep -c obdfilter) -eq 0 ] && \
-		skip "skipping test for remote OST" && return
+	remote_ost_nodsh && skip "remote OST with nodsh" && return
 
 	f="$DIR/$tfile"
-	touch $f
+	$SETSTRIPE $f -c 1 -i 0
 
 	$DIRECTIO write ${f}.2 0 1 || error "directio write error"
 
-	lctl set_param fail_loc=0x217
+	do_facet ost1 lctl set_param fail_loc=0x217
 	truncate $f 1 # vmtruncate() will ignore truncate() error.
 	$DIRECTIO write $f 0 2 && error "write succeeded, expect -ENOENT"
 
-	lctl set_param fail_loc=0
+	do_facet ost1 lctl set_param fail_loc=0
 	$DIRECTIO write $f 0 2 || error "write error"
 
 	cancel_lru_locks osc
 	$DIRECTIO read $f 0 1 || error "read error"
 
-	lctl set_param fail_loc=0x217
+	do_facet ost1 lctl set_param fail_loc=0x217
 	$DIRECTIO read $f 1 1 && error "read succeeded, expect -ENOENT"
 
-	lctl set_param fail_loc=0
+	do_facet ost1 lctl set_param fail_loc=0
 	rm -f $f
 }
 run_test 69 "verify oa2dentry return -ENOENT doesn't LBUG ======"
 
 test_71() {
-	which dbench > /dev/null 2>&1 || { skip "dbench not installed, skip this test" && return 0; }
-	DBENCH_LIB=${DBENCH_LIB:-/usr/lib/dbench}
-	PATH=${DBENCH_LIB}:${PATH}
-	cp `which dbench` $DIR
-
-	TGT=$DIR/client.txt
-	SRC=${SRC:-$DBENCH_LIB/client.txt}
-	[ ! -e $TGT -a -e $SRC ] && echo "copying $SRC to $TGT" && cp $SRC $TGT
-	SRC=$DBENCH_LIB/client_plain.txt
-	[ ! -e $TGT -a -e $SRC ] && echo "copying $SRC to $TGT" && cp $SRC $TGT
-	echo "copying necessary libs to $DIR"
-	LIBS71=$(ldd $DIR/dbench|sed -e 's/\t*//' -e 's/.*=> //' -e 's/ .*//' -e 's/^\///')
-	(cd / && tar chf - $LIBS71) | (cd $DIR && tar xvf -)
-	[ $? = 0 ] || error "can't copy libs $LIBS71 to $DIR"
-	echo "chroot $DIR /dbench -c client.txt 2"
-	chroot $DIR /dbench -c client.txt 2
-	RC=$?
-
-	rm -rf $DIR/dbench $DIR/lib $DIR/lib64
-
-	return $RC
+    sh rundbench -C -D $DIR 2 || error "dbench failed!"
 }
 run_test 71 "Running dbench on lustre (don't segment fault) ===="
 
 test_72() { # bug 5695 - Test that on 2.6 remove_suid works properly
 	check_kernel_version 43 || return 0
 	[ "$RUNAS_ID" = "$UID" ] && skip "RUNAS_ID = UID = $UID -- skipping" && return
-        
+
         # Check that testing environment is properly set up. Skip if not
         FAIL_ON_ERROR=false check_runas_id_ret $RUNAS_ID $RUNAS || {
                 skip "User $RUNAS_ID does not exist - skipping"
@@ -3082,12 +3163,13 @@ test_72() { # bug 5695 - Test that on 2.6 remove_suid works properly
 	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 72 "Test that remove suid works properly (bug5695) ===="
 
 # bug 3462 - multiple simultaneous MDC requests
 test_73() {
-	mkdir $DIR/d73-1 
+	mkdir $DIR/d73-1
 	mkdir $DIR/d73-2
 	multiop_bg_pause $DIR/d73-1/f73-1 O_c || return 1
 	pid1=$!
@@ -3106,8 +3188,8 @@ test_73() {
 	sleep 25
 
 	$CHECKSTAT -t file $DIR/d73-1/f73-1 || return 4
-	$CHECKSTAT -t file $DIR/d73-1/f73-2 || return 5 
-	$CHECKSTAT -t file $DIR/d73-2/f73-3 || return 6 
+	$CHECKSTAT -t file $DIR/d73-1/f73-2 || return 5
+	$CHECKSTAT -t file $DIR/d73-2/f73-3 || return 6
 
 	rm -rf $DIR/d73-*
 }
@@ -3124,6 +3206,7 @@ test_74a() { # bug 6149, 6184
 	ls $DIR/f74a
 	lctl set_param fail_loc=0
 	true
+	rm -f $DIR/f74a
 }
 run_test 74a "ldlm_enqueue freed-export error path, ls (shouldn't LBUG)"
 
@@ -3137,6 +3220,7 @@ test_74b() { # bug 13310
 	touch $DIR/f74b
 	lctl set_param fail_loc=0
 	true
+	rm -f $DIR/f74b
 }
 run_test 74b "ldlm_enqueue freed-export error path, touch (shouldn't LBUG)"
 
@@ -3149,25 +3233,25 @@ export T75_PREP=no
 test75_prep() {
         [ $T75_PREP = "yes" ] && return
         echo "using F75=$F75, F128k=$F128k, FHEAD=$FHEAD, FTAIL=$FTAIL"
- 
+
         dd if=/dev/urandom of=${F75}_128k bs=128k count=1 || error "dd failed"
         log "finished dd"
         chmod 777 ${F128k}
         T75_PREP=yes
 }
- 
+
 test_75a() {
 #	skipped temporarily: we do not have join file currently
 #	please remove this when ready - huanghua
 	return
         test75_prep
- 
+
         cp -p ${F128k} ${FHEAD}
         log "finished cp to $FHEAD"
         cp -p ${F128k} ${FTAIL}
         log "finished cp to $FTAIL"
         cat ${F128k} ${F128k} > ${F75}_sim_sim
- 
+
         $JOIN ${FHEAD} ${FTAIL} || error "join ${FHEAD} ${FTAIL} error"
         log "finished join $FHEAD to ${F75}_sim_sim"
         cmp ${FHEAD} ${F75}_sim_sim || error "${FHEAD} ${F75}_sim_sim differ"
@@ -3175,13 +3259,13 @@ test_75a() {
         $CHECKSTAT -a ${FTAIL} || error "tail ${FTAIL} still exist after join"
 }
 run_test 75a "TEST join file ===================================="
- 
+
 test_75b() {
 #	skipped temporarily: we do not have join file currently
 #	please remove this when ready - huanghua
 	return
         test75_prep
- 
+
         cp -p ${F128k} ${FTAIL}
         cat ${F75}_sim_sim >> ${F75}_join_sim
         cat ${F128k} >> ${F75}_join_sim
@@ -3191,13 +3275,13 @@ test_75b() {
         $CHECKSTAT -a ${FTAIL} || error "tail ${FTAIL} exist after join"
 }
 run_test 75b "TEST join file 2 =================================="
- 
+
 test_75c() {
 #	skipped temporarily: we do not have join file currently
 #	please remove this when ready - huanghua
 	return
         test75_prep
- 
+
         cp -p ${F128k} ${FTAIL}
         cat ${F128k} >> ${F75}_sim_join
         cat ${F75}_join_sim >> ${F75}_sim_join
@@ -3207,13 +3291,13 @@ test_75c() {
         $CHECKSTAT -a ${FHEAD} || error "tail ${FHEAD} exist after join"
 }
 run_test 75c "TEST join file 3 =================================="
- 
+
 test_75d() {
 #	skipped temporarily: we do not have join file currently
 #	please remove this when ready - huanghua
 	return
         test75_prep
- 
+
         cp -p ${F128k} ${FHEAD}
         cp -p ${F128k} ${FHEAD}_tmp
         cat ${F75}_sim_sim >> ${F75}_join_join
@@ -3224,23 +3308,23 @@ test_75d() {
         $CHECKSTAT -a ${FTAIL} || error "tail ${FTAIL} exist after join (2)"
 }
 run_test 75d "TEST join file 4 =================================="
- 
+
 test_75e() {
 #	skipped temporarily: we do not have join file currently
 #	please remove this when ready - huanghua
 	return
         test75_prep
- 
+
         rm -rf ${FHEAD} || "delete join file error"
 }
 run_test 75e "TEST join file 5 (remove joined file) ============="
- 
+
 test_75f() {
 #	skipped temporarily: we do not have join file currently
 #	please remove this when ready - huanghua
 	return
         test75_prep
- 
+
         cp -p ${F128k} ${F75}_join_10_compare
         cp -p ${F128k} ${F75}_join_10
         for ((i = 0; i < 10; i++)); do
@@ -3254,16 +3338,16 @@ test_75f() {
                 error "files ${F75}_join_10 ${F75}_join_10_compare differ"
 }
 run_test 75f "TEST join file 6 (join 10 files) =================="
- 
+
 test_75g() {
 #	skipped temporarily: we do not have join file currently
 #	please remove this when ready - huanghua
 	return
         [ ! -f ${F75}_join_10 ] && echo "${F75}_join_10 missing" && return
         $LFS getstripe ${F75}_join_10
- 
+
         $OPENUNLINK ${F75}_join_10 ${F75}_join_10 || error "files unlink open"
- 
+
         ls -l $F75*
 }
 run_test 75g "TEST join file 7 (open unlink) ===================="
@@ -3329,6 +3413,7 @@ test_77a() { # bug 10889
 	set_checksums 1
 	dd if=$F77_TMP of=$DIR/$tfile bs=1M count=$F77SZ || error "dd error"
 	set_checksums 0
+	rm -f $DIR/$tfile
 }
 run_test 77a "normal checksum read/write operation ============="
 
@@ -3341,11 +3426,12 @@ test_77b() { # bug 10889
 		error "dd error: $?"
 	lctl set_param fail_loc=0
 	set_checksums 0
+	rm -f $DIR/f77b
 }
 run_test 77b "checksum error on client write ===================="
 
 test_77c() { # bug 10889
-	[ ! -f $DIR/f77b ] && skip "requires 77b - skipping" && return  
+	[ ! -f $DIR/f77b ] && skip "requires 77b - skipping" && return
 	set_checksums 1
 	for algo in $CKSUM_TYPES; do
 		cancel_lru_locks osc
@@ -3372,7 +3458,7 @@ test_77d() { # bug 10889
 run_test 77d "checksum error on OST direct write ==============="
 
 test_77e() { # bug 10889
-	[ ! -f $DIR/f77 ] && skip "requires 77d - skipping" && return  
+	[ ! -f $DIR/f77 ] && skip "requires 77d - skipping" && return
 	#define OBD_FAIL_OSC_CHECKSUM_RECEIVE    0x408
 	lctl set_param fail_loc=0x80000408
 	set_checksums 1
@@ -3401,29 +3487,31 @@ test_77f() { # bug 10889
 run_test 77f "repeat checksum error on write (expect error) ===="
 
 test_77g() { # bug 10889
-	[ $(lctl get_param -n devices | grep -c obdfilter) -eq 0 ] && \
-		skip "remote OST" && return
+	remote_ost_nodsh && skip "remote OST with nodsh" && return
+
 	[ ! -f $F77_TMP ] && setup_f77
+
+	$SETSTRIPE $DIR/f77g -c 1 -i 0
 	#define OBD_FAIL_OST_CHECKSUM_RECEIVE       0x21a
-	lctl set_param fail_loc=0x8000021a
+	do_facet ost1 lctl set_param fail_loc=0x8000021a
 	set_checksums 1
-	dd if=$F77_TMP of=$DIR/f77 bs=1M count=$F77SZ || \
+	dd if=$F77_TMP of=$DIR/f77g bs=1M count=$F77SZ || \
 		error "write error: rc=$?"
-	lctl set_param fail_loc=0
+	do_facet ost1 lctl set_param fail_loc=0
 	set_checksums 0
 }
 run_test 77g "checksum error on OST write ======================"
 
 test_77h() { # bug 10889
-	[ $(lctl get_param -n devices | grep -c obdfilter) -eq 0 ] && \
-		skip "remote OST" && return
-	[ ! -f $DIR/f77 ] && skip "requires 77g - skipping" && return  
+	remote_ost_nodsh && skip "remote OST with nodsh" && return
+
+	[ ! -f $DIR/f77g ] && skip "requires 77g - skipping" && return
 	cancel_lru_locks osc
 	#define OBD_FAIL_OST_CHECKSUM_SEND          0x21b
-	lctl set_param fail_loc=0x8000021b
+	do_facet ost1 lctl set_param fail_loc=0x8000021b
 	set_checksums 1
-	cmp $F77_TMP $DIR/f77 || error "file compare failed"
-	lctl set_param fail_loc=0
+	cmp $F77_TMP $DIR/f77g || error "file compare failed"
+	do_facet ost1 lctl set_param fail_loc=0
 	set_checksums 0
 }
 run_test 77h "checksum error on OST read ======================="
@@ -3469,7 +3557,12 @@ test_78() { # bug 10901
 	echo "MemTotal: $MEMTOTAL"
 # reserve 256MB of memory for the kernel and other running processes,
 # and then take 1/2 of the remaining memory for the read/write buffers.
-	MEMTOTAL=$(((MEMTOTAL - 256 ) / 2))
+    if [ $MEMTOTAL -gt 512 ] ;then
+        MEMTOTAL=$(((MEMTOTAL - 256 ) / 2))
+    else
+        # for those poor memory-starved high-end clusters...
+        MEMTOTAL=$((MEMTOTAL / 2))
+    fi
 	echo "Mem to use for directio: $MEMTOTAL"
 	[ $F78SIZE -gt $MEMTOTAL ] && F78SIZE=$MEMTOTAL
 	[ $F78SIZE -gt 512 ] && F78SIZE=512
@@ -3479,11 +3572,12 @@ test_78() { # bug 10901
 	[ $SMALLESTOST -lt 10240 ] && \
 		skip "too small OSTSIZE, useless to run large O_DIRECT test" && return 0
 
-	[ $F78SIZE -gt $((SMALLESTOST * $OSTCOUNT / 1024 - 5)) ] && \
-		F78SIZE=$((SMALLESTOST * $OSTCOUNT / 1024 - 5))
+	[ $F78SIZE -gt $((SMALLESTOST * $OSTCOUNT / 1024 - 80)) ] && \
+		F78SIZE=$((SMALLESTOST * $OSTCOUNT / 1024 - 80))
+
 	[ "$SLOW" = "no" ] && NSEQ=1 && [ $F78SIZE -gt 32 ] && F78SIZE=32
 	echo "File size: $F78SIZE"
-	$SETSTRIPE $DIR/$tfile -c -1 || error "setstripe failed"
+	$SETSTRIPE $DIR/$tfile -c $OSTCOUNT || error "setstripe failed"
  	for i in `seq 1 $NSEQ`
  	do
  		FSIZE=$(($F78SIZE / ($NSEQ - $i + 1)))
@@ -3496,14 +3590,12 @@ test_78() { # bug 10901
 run_test 78 "handle large O_DIRECT writes correctly ============"
 
 test_79() { # bug 12743
-	[ $(lctl get_param -n devices | grep -c obdfilter) -eq 0 ] &&
-		skip "skipping test for remote OST" && return
-
 	wait_delete_completed
 
-        BKTOTAL=`lctl get_param -n obdfilter.*.kbytestotal | awk 'BEGIN{total=0}; {total+=$1}; END{print total}'`
-        BKFREE=`lctl get_param -n obdfilter.*.kbytesfree | awk 'BEGIN{free=0}; {free+=$1}; END{print free}'`
-        BKAVAIL=`lctl get_param -n obdfilter.*.kbytesavail | awk 'BEGIN{avail=0}; {avail+=$1}; END{print avail}'`
+        BKTOTAL=$(calc_osc_kbytes kbytestotal)
+        BKFREE=$(calc_osc_kbytes kbytesfree)
+        BKAVAIL=$(calc_osc_kbytes kbytesavail)
+
         STRING=`df -P $MOUNT | tail -n 1 | awk '{print $2","$3","$4}'`
         DFTOTAL=`echo $STRING | cut -d, -f1`
         DFUSED=`echo $STRING  | cut -d, -f2`
@@ -3512,15 +3604,15 @@ test_79() { # bug 12743
 
         ALLOWANCE=$((64 * $OSTCOUNT))
 
-        if [ $DFTOTAL -lt $(($BKTOTAL - $ALLOWANCE)) ] ||  
+        if [ $DFTOTAL -lt $(($BKTOTAL - $ALLOWANCE)) ] ||
            [ $DFTOTAL -gt $(($BKTOTAL + $ALLOWANCE)) ] ; then
                 error "df total($DFTOTAL) mismatch OST total($BKTOTAL)"
         fi
-        if [ $DFFREE -lt $(($BKFREE - $ALLOWANCE)) ] || 
+        if [ $DFFREE -lt $(($BKFREE - $ALLOWANCE)) ] ||
            [ $DFFREE -gt $(($BKFREE + $ALLOWANCE)) ] ; then
                 error "df free($DFFREE) mismatch OST free($BKFREE)"
         fi
-        if [ $DFAVAIL -lt $(($BKAVAIL - $ALLOWANCE)) ] || 
+        if [ $DFAVAIL -lt $(($BKAVAIL - $ALLOWANCE)) ] ||
            [ $DFAVAIL -gt $(($BKAVAIL + $ALLOWANCE)) ] ; then
                 error "df avail($DFAVAIL) mismatch OST avail($BKAVAIL)"
         fi
@@ -3538,6 +3630,7 @@ test_80() { # bug 10718
                 error "elapsed for 1M@1T = $DIFF"
         fi
         true
+    	rm -f $DIR/$tfile
 }
 run_test 80 "Page eviction is equally fast at high offsets too  ===="
 
@@ -3560,6 +3653,7 @@ test_99a() {
 run_test 99a "cvs init ========================================="
 
 test_99b() {
+        [ -z "$(which cvs 2>/dev/null)" ] && skip "could not find cvs" && return
 	[ ! -d $DIR/d99cvsroot ] && test_99a
 	cd /etc/init.d
 	# some versions of cvs import exit(1) when asked to import links or
@@ -3572,6 +3666,7 @@ test_99b() {
 run_test 99b "cvs import ======================================="
 
 test_99c() {
+        [ -z "$(which cvs 2>/dev/null)" ] && skip "could not find cvs" && return
 	[ ! -d $DIR/d99cvsroot ] && test_99b
 	cd $DIR
 	mkdir -p $DIR/d99reposname
@@ -3581,6 +3676,7 @@ test_99c() {
 run_test 99c "cvs checkout ====================================="
 
 test_99d() {
+        [ -z "$(which cvs 2>/dev/null)" ] && skip "could not find cvs" && return
 	[ ! -d $DIR/d99cvsroot ] && test_99c
 	cd $DIR/d99reposname
 	$RUNAS touch foo99
@@ -3589,6 +3685,7 @@ test_99d() {
 run_test 99d "cvs add =========================================="
 
 test_99e() {
+        [ -z "$(which cvs 2>/dev/null)" ] && skip "could not find cvs" && return
 	[ ! -d $DIR/d99cvsroot ] && test_99c
 	cd $DIR/d99reposname
 	$RUNAS cvs update
@@ -3596,17 +3693,30 @@ test_99e() {
 run_test 99e "cvs update ======================================="
 
 test_99f() {
+        [ -z "$(which cvs 2>/dev/null)" ] && skip "could not find cvs" && return
 	[ ! -d $DIR/d99cvsroot ] && test_99d
 	cd $DIR/d99reposname
 	$RUNAS cvs commit -m 'nomsg' foo99
+    rm -fr $DIR/d99cvsroot
 }
 run_test 99f "cvs commit ======================================="
 
 test_100() {
-	netstat -tna | while read PROT SND RCV LOCAL REMOTE STAT; do
+	[ "$NETTYPE" = tcp ] || \
+		{ skip "TCP secure port test, not useful for NETTYPE=$NETTYPE" && \
+			return ; }
+
+	remote_ost_nodsh && skip "remote OST with nodsh" && return
+	remote_mds_nodsh && skip "remote MDS with nodsh" && return
+	remote_servers || \
+		{ skip "useless for local single node setup" && return; }
+
+	netstat -tna | ( rc=1; while read PROT SND RCV LOCAL REMOTE STAT; do
 		[ "$PROT" != "tcp" ] && continue
-		RPORT=`echo $REMOTE | cut -d: -f2`
+		RPORT=$(echo $REMOTE | cut -d: -f2)
 		[ "$RPORT" != "$ACCEPTOR_PORT" ] && continue
+
+		rc=0
 		LPORT=`echo $LOCAL | cut -d: -f2`
 		if [ $LPORT -ge 1024 ]; then
 			echo "bad: $PROT $SND $RCV $LOCAL $REMOTE $STAT"
@@ -3614,7 +3724,7 @@ test_100() {
 			error "local: $LPORT > 1024, remote: $RPORT"
 		fi
 	done
-	true
+	[ "$rc" = 0 ] || error "privileged port not found" )
 }
 run_test 100 "check local port using privileged port ==========="
 
@@ -3659,15 +3769,16 @@ 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 | get_named_value 'read but discarded'`; do
-		discard=$(($discard + $s))
+        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
 
 	if [ $(($discard * 10)) -gt $nreads ] ;then
 		lctl get_param osc.*-osc*.rpc_stats
 		lctl get_param llite.*.read_ahead_stats
-		error "too many ($discard) discarded pages" 
+		error "too many ($discard) discarded pages"
 	fi
 	rm -f $DIR/$tfile || true
 }
@@ -3686,14 +3797,15 @@ setup_test101() {
 	$SETSTRIPE $DIR/$tfile -s $STRIPE_SIZE -i $STRIPE_OFFSET -c $OSTCOUNT
 
 	dd if=/dev/zero of=$DIR/$tfile bs=1024k count=100 2> /dev/null
-	SETUP_TEST102=yes
+	SETUP_TEST101=yes
 }
 
 cleanup_test101() {
 	[ "$SETUP_TEST101" = "yes" ] || return
 	trap 0
 	rm -rf $DIR/$tdir
-	SETUP_TEST102=no
+    rm -f $DIR/$tfile
+	SETUP_TEST101=no
 }
 
 calc_total() {
@@ -3706,10 +3818,11 @@ ra_check_101() {
 	local RA_INC=1048576
 	local STRIDE_LENGTH=$((STRIPE_SIZE/READ_SIZE))
 	local FILE_LENGTH=$((64*100))
-	local discard_limit=$(((((((STRIDE_LENGTH - 1))*3)/(STRIDE_LENGTH*OSTCOUNT))* \
-			     (STRIDE_LENGTH*OSTCOUNT - STRIDE_LENGTH))))
-	DISCARD=`$LCTL get_param -n llite.*.read_ahead_stats |   \
-			 get_named_value 'read but discarded' | calc_total`
+	local discard_limit=$((((STRIDE_LENGTH - 1)*3/(STRIDE_LENGTH*OSTCOUNT))* \
+			     (STRIDE_LENGTH*OSTCOUNT - STRIDE_LENGTH)))
+	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
@@ -3727,7 +3840,7 @@ test_101b() {
 	local ITERATION=$((FILE_LENGTH/STRIDE_SIZE))
 	# prepare the read-ahead file
 	setup_test101
-	cancel_lru_locks osc 
+	cancel_lru_locks osc
 	for BIDX in 2 4 8 16 32 64 128 256
 	do
 		local BSIZE=$((BIDX*4096))
@@ -3750,18 +3863,18 @@ setup_test102() {
 	[ "$SETUP_TEST102" = "yes" ] && return
 	mkdir -p $DIR/$tdir
 	STRIPE_SIZE=65536
-	STRIPE_COUNT=4 
+	STRIPE_COUNT=4
 	STRIPE_OFFSET=2
 
 	trap cleanup_test102 EXIT
 	cd $DIR
 	$SETSTRIPE $tdir -s $STRIPE_SIZE -i $STRIPE_OFFSET -c $STRIPE_COUNT
-	cd $DIR/$tdir 
+	cd $DIR/$tdir
 	for num in 1 2 3 4
 	do
 		for count in 1 2 3 4
 		do
-			for offset in 0 1 2 3 
+			for offset in 0 1 2 3
 			do
 				local stripe_size=`expr $STRIPE_SIZE \* $num`
 				local file=file"$num-$offset-$count"
@@ -3771,7 +3884,7 @@ setup_test102() {
 	done
 
 	cd $DIR
-	star -c  f=$TMP/f102.tar $tdir 
+	star -c  f=$TMP/f102.tar $tdir
 	SETUP_TEST102=yes
 }
 
@@ -3798,7 +3911,7 @@ test_102a() {
         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 user.author1 -v author1 $testfile || error
         [ "`getfattr -n user.author1 $testfile 2> /dev/null | \
         grep "user.author1"`" == "user.author1=\"author1\"" ] || error
@@ -3809,7 +3922,7 @@ test_102a() {
         [ `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 | \
@@ -3853,6 +3966,7 @@ test_102b() {
 	local stripe_count=`grep "count"  $tmp_file| awk '{print $2}'`
 	[ "$stripe_size" -eq 65536 ] || error "stripe size $stripe_size != 65536"
 	[ "$stripe_count" -eq 2 ] || error "stripe count $stripe_count != 2"
+	rm -f $DIR/$tfile
 }
 run_test 102b "getfattr/setfattr for trusted.lov EAs ============"
 
@@ -3898,12 +4012,12 @@ compare_stripe_info1() {
 	do
 		for count in 1 2 3 4
 		do
-			for offset in 0 1 2 3 
+			for offset in 0 1 2 3
 			do
 				local size=`expr $STRIPE_SIZE \* $num`
 				local file=file"$num-$offset-$count"
 				local tmp_file=out
-				$GETSTRIPE -v $file > $tmp_file 
+				$GETSTRIPE -v $file > $tmp_file
 				get_stripe_info  $tmp_file
 				if test $stripe_size -ne $size
 				then
@@ -3928,7 +4042,7 @@ compare_stripe_info2() {
 	do
 		for count in 1 2 3 4
 		do
-			for offset in 0 1 2 3 
+			for offset in 0 1 2 3
 			do
 				local size=`expr $STRIPE_SIZE \* $num`
 				local file=file"$num-$offset-$count"
@@ -3955,7 +4069,7 @@ compare_stripe_info2() {
 
 test_102d() {
 	# b10930: star test for trusted.lov xattr
-	star --xhelp 2>&1 | grep -q nolustre  
+	star --xhelp 2>&1 | grep -q nolustre
 	if [ $? -ne 0 ]
 	then
 		skip "being skipped because a lustre-aware star is not installed." && return
@@ -3972,7 +4086,7 @@ run_test 102d "star restore stripe info from tarfile,not keep osts ==========="
 
 test_102e() {
 	# b10930: star test for trusted.lov xattr
-	star --xhelp 2>&1 | grep -q nolustre  
+	star --xhelp 2>&1 | grep -q nolustre
 	[ $? -ne 0 ] && skip "lustre-aware star is not installed" && return
 	[ "$OSTCOUNT" -lt "4" ] && skip "skipping 4-stripe test" && return
 	setup_test102
@@ -3985,7 +4099,7 @@ run_test 102e "star restore stripe info from tarfile, keep osts ==========="
 
 test_102f() {
 	# b10930: star test for trusted.lov xattr
-	star --xhelp 2>&1 | grep -q nolustre  
+	star --xhelp 2>&1 | grep -q nolustre
 	[ $? -ne 0 ] && skip "lustre-aware star is not installed" && return
 	[ "$OSTCOUNT" -lt "4" ] && skip "skipping 4-stripe test" && return
 	setup_test102
@@ -3999,7 +4113,7 @@ run_test 102f "star copy files, not keep osts ==========="
 
 test_102g() {
 	# b10930: star test for trusted.lov xattr
-	star --xhelp 2>&1 | grep -q nolustre  
+	star --xhelp 2>&1 | grep -q nolustre
 	[ $? -ne 0 ] && skip "lustre-aware star is not installed" && return
 	[ "$OSTCOUNT" -lt "4" ] && skip "skipping 4-stripe test" && return
 	setup_test102
@@ -4053,9 +4167,19 @@ test_102h() { # bug 15777
 		error "$XBIG different after growing $XSML"
 	fi
 	log "$XBIG still valid after growing $XSML"
+	rm -f $file
 }
 run_test 102h "grow xattr from inside inode to external block"
 
+test_102i() { # bug 17038
+        touch $DIR/$tfile
+        ln -s $DIR/$tfile $DIR/${tfile}link
+        getfattr -n trusted.lov $DIR/$tfile || error "lgetxattr on $DIR/$tfile failed"
+        getfattr -h -n trusted.lov $DIR/${tfile}link 2>&1 | grep -i "no such attr" || error "error for lgetxattr on $DIR/${tfile}link is not ENODATA"
+        rm -f $DIR/$tfile $DIR/${tfile}link
+}
+run_test 102i "lgetxattr test on symbolic link ============"
+
 run_acl_subtest()
 {
     $LUSTRE/tests/acl/run $LUSTRE/tests/acl/$1.test
@@ -4121,6 +4245,7 @@ test_104() {
 	lfs df || error "lfs df with deactivated OSC failed"
 	lctl --device %$OSC recover
 	lfs df || error "lfs df with reactivated OSC failed"
+	rm -f $DIR/$tfile
 }
 run_test 104 "lfs df [-ih] [path] test ========================="
 
@@ -4129,10 +4254,11 @@ test_105a() {
         touch $DIR/$tfile
         if [ -n "`mount | grep \"$DIR.*flock\" | grep -v noflock`" ];
         then
-                flocks_test on -f $DIR/$tfile || error "fail flock on"
+                flocks_test 1 on -f $DIR/$tfile || error "fail flock on"
         else
-                flocks_test off -f $DIR/$tfile || error "fail flock off"
+                flocks_test 1 off -f $DIR/$tfile || error "fail flock off"
         fi
+	rm -f $DIR/$tfile
 }
 run_test 105a "flock when mounted without -o flock test ========"
 
@@ -4140,10 +4266,11 @@ test_105b() {
         touch $DIR/$tfile
         if [ -n "`mount | grep \"$DIR.*flock\" | grep -v noflock`" ];
         then
-                flocks_test on -c $DIR/$tfile || error "fail flock on"
+                flocks_test 1 on -c $DIR/$tfile || error "fail flock on"
         else
-                flocks_test off -c $DIR/$tfile || error "fail flock off"
+                flocks_test 1 off -c $DIR/$tfile || error "fail flock off"
         fi
+	rm -f $DIR/$tfile
 }
 run_test 105b "fcntl when mounted without -o flock test ========"
 
@@ -4151,13 +4278,24 @@ test_105c() {
         touch $DIR/$tfile
         if [ -n "`mount | grep \"$DIR.*flock\" | grep -v noflock`" ];
         then
-                flocks_test on -l $DIR/$tfile || error "fail flock on"
+                flocks_test 1 on -l $DIR/$tfile || error "fail flock on"
         else
-                flocks_test off -l $DIR/$tfile || error "fail flock off"
+                flocks_test 1 off -l $DIR/$tfile || error "fail flock off"
         fi
+	rm -f $DIR/$tfile
 }
 run_test 105c "lockf when mounted without -o flock test ========"
 
+test_105d() { # bug 15924
+        mkdir -p $DIR/$tdir
+        [ -z "`mount | grep \"$DIR.*flock\" | grep -v noflock`" ] && \
+                skip "mount w/o flock enabled" && return
+        #define OBD_FAIL_LDLM_CP_CB_WAIT  0x315
+        $LCTL set_param fail_loc=0x80000315
+        flocks_test 2 $DIR/$tdir
+}
+run_test 105d "flock race (should not freeze) ========"
+
 test_106() { #bug 10921
 	mkdir -p $DIR/$tdir
 	$DIR/$tdir && error "exec $DIR/$tdir succeeded"
@@ -4168,14 +4306,19 @@ run_test 106 "attempt exec of dir followed by chown of that dir"
 test_107() {
         CDIR=`pwd`
         cd $DIR
+
+        local file=core
+        rm -f $file
+
+        local save_pattern=$(sysctl -n kernel.core_pattern)
+        local save_uses_pid=$(sysctl -n kernel.core_uses_pid)
+        sysctl -w kernel.core_pattern=$file
+        sysctl -w kernel.core_uses_pid=0
+
         ulimit -c unlimited
         sleep 60 &
         SLEEPPID=$!
 
-        file=`sysctl -n kernel.core_pattern`
-        core_pid=`sysctl -n kernel.core_uses_pid`
-        [ $core_pid -eq 1 ] && file=$file.$SLEEPPID
-        rm -f $file
         sleep 1
 
         kill -s 11 $SLEEPPID
@@ -4187,6 +4330,8 @@ test_107() {
                 error "Fail to create core file $file"
         fi
         rm -f $file
+        sysctl -w kernel.core_pattern=$save_pattern
+        sysctl -w kernel.core_uses_pid=$save_uses_pid
         cd $CDIR
 }
 run_test 107 "Coredump on SIG"
@@ -4199,6 +4344,7 @@ test_110() {
 	touch $DIR/d110/yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy && error ""create with 256 char should fail, but not
 
 	ls -l $DIR/d110
+    rm -fr $DIR/d110
 }
 run_test 110 "filename length checking"
 
@@ -4222,7 +4368,7 @@ test_115() {
 
 	# don't return an error
         [ $OSTIO_post -eq $OSTIO_pre ] && echo \
-	    "FAIL: No addition ll_ost_io threads were created ($OSTIO_pre)" &&\
+	    "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
 
@@ -4245,13 +4391,12 @@ free_min_max () {
 		MINV=${AVAIL[i]}; MINI=$i
 	    fi
 	done
-	echo Min free space: OST $MINI: $MINV 
-	echo Max free space: OST $MAXI: $MAXV 
+	echo Min free space: OST $MINI: $MINV
+	echo Max free space: OST $MAXI: $MAXV
 }
 
 test_116() {
 	[ "$OSTCOUNT" -lt "2" ] && skip "$OSTCOUNT < 2 OSTs" && return
-	remote_mds && skip "remote MDS" && return
 
 	echo -n "Free space priority "
 	lctl get_param -n lov.*-clilov-*.qos_prio_free
@@ -4286,7 +4431,7 @@ test_116() {
 	    echo "ok"
 	else
 	    echo "failed - QOS mode won't be used"
-	    error "QOS imbalance criteria not met"
+	    error_ignore "QOS imbalance criteria not met"
 	    return
 	fi
 
@@ -4311,14 +4456,14 @@ test_116() {
 	free_min_max
 	DIFF2=$(($MAXV - $MINV))
 	echo "free space delta: orig $DIFF final $DIFF2"
-	[ $DIFF2 -gt $DIFF ] && echo "delta got worse!" 
+	[ $DIFF2 -gt $DIFF ] && echo "delta got worse!"
 	DIFF=$(($MINV1 - ${AVAIL[$MINI1]}))
 	echo "Wrote $DIFF to smaller OST $MINI1"
 	DIFF2=$(($MAXV1 - ${AVAIL[$MAXI1]}))
 	echo "Wrote $DIFF2 to larger OST $MAXI1"
 	[ $DIFF -gt 0 ] && echo "Wrote $(($DIFF2 * 100 / $DIFF - 100))% more data to larger OST $MAXI1"
 
-	# Figure out which files were written where 
+	# Figure out which files were written where
 	UUID=$(lctl get_param -n lov.${FSNAME}-clilov-*.target_obd |
                awk '/'$MINI1': / {print $2; exit}')
 	echo $UUID
@@ -4330,7 +4475,7 @@ test_116() {
         MAXC=$($GETSTRIPE --obd $UUID $DIR/$tdir | wc -l)
 	echo "$MAXC files created on larger OST $MAXI1"
 	[ $MINC -gt 0 ] && echo "Wrote $(($MAXC * 100 / $MINC - 100))% more files to larger OST $MAXI1"
-	[ $MAXC -gt $MINC ] || error "stripe QOS didn't balance free space"
+	[ $MAXC -gt $MINC ] || error_ignore "stripe QOS didn't balance free space"
 }
 run_test 116 "stripe QOS: free space balance ==================="
 
@@ -4342,6 +4487,7 @@ test_117() # bug 10891
         > $DIR/$tfile || error "truncate failed"
         lctl set_param fail_loc=0
         echo "Truncate succeeded."
+	rm -f $DIR/$tfile
 }
 run_test 117 "verify fsfilt_extend =========="
 
@@ -4378,12 +4524,13 @@ test_118a() #bug 11710
 		error "Dirty pages not flushed to disk, dirty=$DIRTY, writeback=$WRITEBACK"
 		return 1;
         fi
+	rm -f $DIR/$tfile
 }
 run_test 118a "verify O_SYNC works =========="
 
 test_118b()
 {
-	remote_ost_nodsh && skip "remote OST" && return
+	remote_ost_nodsh && skip "remote OST with nodsh" && return
 
 	reset_async
 
@@ -4419,7 +4566,7 @@ run_test 118b "Reclaim dirty pages on fatal error =========="
 
 test_118c()
 {
-	remote_ost_nodsh && skip "remote OST" && return
+	remote_ost_nodsh && skip "remote OST with nodsh" && return
 
 	reset_async
 
@@ -4463,7 +4610,7 @@ run_test 118c "Fsync blocks on EROFS until dirty pages are flushed =========="
 
 test_118d()
 {
-	remote_ost_nodsh && skip "remote OST" && return
+	remote_ost_nodsh && skip "remote OST with nodsh" && return
 
 	reset_async
 
@@ -4514,7 +4661,7 @@ test_118f() {
 	fi
 	
         lctl set_param fail_loc=0x0
-        
+
         LOCKED=$(lctl get_param -n llite.*.dump_page_cache | grep -c locked)
         DIRTY=$(lctl get_param -n llite.*.dump_page_cache | grep -c dirty)
         WRITEBACK=$(lctl get_param -n llite.*.dump_page_cache |
@@ -4571,7 +4718,7 @@ test_118g() {
 run_test 118g "Don't stay in wait if we got local -ENOMEM  =========="
 
 test_118h() {
-	remote_ost_nodsh && skip "remote OST" && return
+	remote_ost_nodsh && skip "remote OST with nodsh" && return
 
         reset_async
 
@@ -4606,7 +4753,7 @@ test_118h() {
 run_test 118h "Verify timeout in handling recoverables errors  =========="
 
 test_118i() {
-	remote_ost_nodsh && skip "remote OST" && return
+	remote_ost_nodsh && skip "remote OST with nodsh" && return
 
         reset_async
 
@@ -4644,7 +4791,7 @@ test_118i() {
 run_test 118i "Fix error before timeout in recoverable error  =========="
 
 test_118j() {
-	remote_ost_nodsh && skip "remote OST" && return
+	remote_ost_nodsh && skip "remote OST with nodsh" && return
 
         reset_async
 
@@ -4680,6 +4827,8 @@ run_test 118j "Simulate unrecoverable OST side error =========="
 
 test_118k()
 {
+	remote_ost_nodsh && skip "remote OSTs with nodsh" && return
+
 	#define OBD_FAIL_OST_BRW_WRITE_BULK      0x20e
 	set_nodes_failloc "$(osts_nodes)" 0x20e
 	mkdir -p $DIR/$tdir
@@ -4956,8 +5105,10 @@ test_121() { #bug #10589
 run_test 121 "read cancel race ========="
 
 test_123a() { # was test 123, statahead(bug 11401)
+        SLOWOK=0
         if [ -z "$(grep "processor.*: 1" /proc/cpuinfo)" ]; then
                 log "testing on UP system. Performance may be not as good as expected."
+		SLOWOK=1
         fi
 
         remount_client $MOUNT
@@ -5012,7 +5163,7 @@ test_123a() { # was test 123, statahead(bug 11401)
         lctl get_param -n llite.*.statahead_stats
         # wait for commitment of removal
         sleep 2
-        [ $error -ne 0 ] && error "statahead is slow!"
+        [ $error -ne 0 -a $SLOWOK -eq 0 ] && error "statahead is slow!"
         return 0
 }
 run_test 123a "verify statahead work"
@@ -5044,9 +5195,9 @@ test_124a() {
 
         # use touch to produce $NR new locks
         log "create $NR files at $DIR/$tdir"
-        createmany -o $DIR/$tdir/f $NR || 
-                error "failed to create $NR files in $DIR/$tdir" 
-        
+        createmany -o $DIR/$tdir/f $NR ||
+                error "failed to create $NR files in $DIR/$tdir"
+
         cancel_lru_locks mdc
         ls -l $DIR/$tdir > /dev/null
 
@@ -5105,20 +5256,31 @@ test_124a() {
 }
 run_test 124a "lru resize ======================================="
 
+get_max_pool_limit()
+{
+        local limit=`lctl get_param -n ldlm.namespaces.*-MDT0000-mdc-*.pool.limit`
+        local max=0
+        for l in $limit; do
+                if test $l -gt $max; then
+                        max=$l
+                fi
+        done
+        echo $max
+}
+
 test_124b() {
 	[ -z "`lctl get_param -n mdc.*.connect_flags | grep lru_resize`" ] && \
                skip "no lru resize on server" && return 0
 
-        # even for cmd no matter what metadata namespace to use for getting 
-        # the limit, we use appropriate.
-        LIMIT=`lctl get_param -n ldlm.namespaces.*mdc*.pool.limit`
+        LIMIT=`get_max_pool_limit`
 
         NR=$(($(default_lru_size)*20))
         if [ $NR -gt $LIMIT ]; then
+                log "Limit lock number by $LIMIT locks"
                 NR=$LIMIT
         fi
         lru_resize_disable mdc
-        mkdir -p $DIR/$tdir/disable_lru_resize || 
+        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
@@ -5142,7 +5304,7 @@ test_124b() {
         unlinkmany $DIR/$tdir/disable_lru_resize/f $NR
 
         lru_resize_enable mdc
-        mkdir -p $DIR/$tdir/enable_lru_resize || 
+        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
@@ -5205,19 +5367,20 @@ test_127() { # bug 15521
 
         $LCTL get_param osc.*0000-osc-*.stats | grep samples > $DIR/${tfile}.tmp
         while read NAME COUNT SAMP UNIT MIN MAX SUM SUMSQ; do
-                eval $NAME=$COUNT
                 echo "got $COUNT $NAME"
-
+                [ ! $MIN ] && error "Missing min value for $NAME proc entry"
+                eval $NAME=$COUNT || error "Wrong proc format"
+		
                 case $NAME in
-                        ost_read|ost_write)
+                        read_bytes|write_bytes)
                         [ $MIN -lt 4096 ] && error "min is too small: $MIN"
                         [ $MIN -gt $FSIZE ] && error "min is too big: $MIN"
                         [ $MAX -lt 4096 ] && error "max is too small: $MAX"
                         [ $MAX -gt $FSIZE ] && error "max is too big: $MAX"
                         [ $SUM -ne $FSIZE ] && error "sum is wrong: $SUM"
-                        [ $SUMSQ -lt $(((FSIZE /4096) * (4096 * 4096))) ] && 
+                        [ $SUMSQ -lt $(((FSIZE /4096) * (4096 * 4096))) ] &&
                                 error "sumsquare is too small: $SUMSQ"
-                        [ $SUMSQ -gt $((FSIZE * FSIZE)) ] && 
+                        [ $SUMSQ -gt $((FSIZE * FSIZE)) ] &&
                                 error "sumsquare is too big: $SUMSQ"
                         ;;
                         *) ;;
@@ -5225,8 +5388,10 @@ test_127() { # bug 15521
         done < $DIR/${tfile}.tmp
 
         #check that we actually got some stats
-        [ "$ost_read" ] || error "no read done"
-        [ "$ost_write" ] || error "no write done"
+        [ "$read_bytes" ] || error "Missing read_bytes stats"
+        [ "$write_bytes" ] || error "Missing write_bytes stats"
+        [ "$read_bytes" != 0 ] || error "no read done"
+        [ "$write_bytes" != 0 ] || error "no write done"
 }
 run_test 127 "verify the client stats are sane"
 
@@ -5243,41 +5408,591 @@ test_128() { # bug 15212
 }
 run_test 128 "interactive lfs for 2 consecutive find's"
 
+set_dir_limits () {
+        local mntdev
+        local node
+
+	local LDPROC=/proc/fs/ldiskfs
+
+        for node in $(mdts_nodes); do
+                devs=$(do_node $node "lctl get_param -n devices" | awk '($3 ~ "mdt" && $4 ~ "MDT") { print $4 }')
+	        for dev in $devs; do
+		        mntdev=$(do_node $node "lctl get_param -n osd.$dev.mntdev")
+		        do_node $node "echo $1 >$LDPROC/\\\$(basename $mntdev)/max_dir_size"
+		done
+	done
+}
 test_129() {
         [ "$FSTYPE" != "ldiskfs" ] && skip "not needed for FSTYPE=$FSTYPE" && return 0
+        remote_mds_nodsh && skip "remote MDS with nodsh" && return
 
-        DEV=$(basename $(do_facet mds lctl get_param -n osd.*MDT*.mntdev))
-        [ -z "$DEV" ] && error "can't access mds mntdev" 
         EFBIG=27
-        LDPROC=/proc/fs/ldiskfs/$DEV/max_dir_size
         MAX=16384
 
-        do_facet mds "echo $MAX > $LDPROC"
+        set_dir_limits $MAX
 
         mkdir -p $DIR/$tdir
 
         I=0
         J=0
-        while [ ! $I -gt $MAX ]; do
+        while [ ! $I -gt $((MAX * MDSCOUNT)) ]; do
                 multiop $DIR/$tdir/$J Oc
                 rc=$?
                 if [ $rc -eq $EFBIG ]; then
-                        do_facet mds "echo 0 >$LDPROC"
+                        set_dir_limits 0
                         echo "return code $rc received as expected"
                         return 0
                 elif [ $rc -ne 0 ]; then
-                        do_facet mds "echo 0 >$LDPROC"
+                        set_dir_limits 0
                         error_exit "return code $rc received instead of expected $EFBIG"
                 fi
                 J=$((J+1))
                 I=$(stat -c%s "$DIR/$tdir")
         done
 
-        error "exceeded dir size limit: $I bytes"
-        do_facet mds "echo 0 >$LDPROC"
+        error "exceeded dir size limit $MAX x $MDSCOUNT $((MAX * MDSCOUNT)) : $I bytes"
+        do_facet $SINGLEMDS "echo 0 >$LDPROC"
 }
 run_test 129 "test directory size limit ========================"
 
+test_130a() {
+	filefrag_op=$(filefrag -e 2>&1 | grep "invalid option")
+	[ -n "$filefrag_op" ] && skip "filefrag does not support FIEMAP" && 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"
+
+	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"`
+
+	lun=`$GETSTRIPE $fm_file  | grep -A 10 obdidx | awk '{print $1}' | grep -v "obdidx"`
+
+	start_blk=`echo $filefrag_op | cut -d: -f2 | cut -d. -f1`
+	IFS=$'\n'
+	tot_len=0
+	for line in $filefrag_op
+	do
+		frag_lun=`echo $line | cut -d: -f5`
+		ext_len=`echo $line | cut -d: -f4`
+		if (( $frag_lun != $lun )); then
+			error "FIEMAP on 1-stripe file($fm_file) failed"
+			return
+		fi
+		(( tot_len += ext_len ))
+	done
+
+	if (( lun != frag_lun || start_blk != 0 || tot_len != 64 )); then
+		error "FIEMAP on 1-stripe file($fm_file) failed;"
+		return
+	fi
+	echo "FIEMAP on single striped file succeeded"
+}
+run_test 130a "FIEMAP (1-stripe file)"
+
+test_130b() {
+	[ "$OSTCOUNT" -lt "2" ] && skip "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 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"
+
+	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"`
+
+	last_lun=`echo $filefrag_op | cut -d: -f5`
+
+	IFS=$'\n'
+	tot_len=0
+	num_luns=1
+	for line in $filefrag_op
+	do
+		frag_lun=`echo $line | cut -d: -f5`
+		ext_len=`echo $line | cut -d: -f4`
+		if (( $frag_lun != $last_lun )); then
+			if (( tot_len != 1024 )); then
+				error "FIEMAP on $fm_file failed; returned len $tot_len for OST $last_lun instead of 256"
+				return
+			else
+				(( num_luns += 1 ))
+				tot_len=0
+			fi
+		fi
+		(( tot_len += ext_len ))
+		last_lun=$frag_lun
+	done
+	if (( num_luns != 2 || tot_len != 1024 )); then
+		error "FIEMAP on $fm_file failed; returned wrong number of luns or wrong len for OST $last_lun"
+		return
+	fi
+
+	echo "FIEMAP on 2-stripe file succeeded"
+}
+run_test 130b "FIEMAP (2-stripe file)"
+
+test_130c() {
+	[ "$OSTCOUNT" -lt "2" ] && skip "skipping FIEMAP on 2-stripe file with hole test" && return
+
+	filefrag_op=$(filefrag -e 2>&1 | grep "invalid option")
+	[ -n "$filefrag_op" ] && skip "filefrag does not support FIEMAP" && 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 seek=1 bs=1M count=1 || 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"`
+
+	last_lun=`echo $filefrag_op | cut -d: -f5`
+
+	IFS=$'\n'
+	tot_len=0
+	num_luns=1
+	for line in $filefrag_op
+	do
+		frag_lun=`echo $line | cut -d: -f5`
+		ext_len=`echo $line | cut -d: -f4`
+		if (( $frag_lun != $last_lun )); then
+			logical=`echo $line | cut -d: -f2 | cut -d. -f1`
+			if (( logical != 512 )); then
+				error "FIEMAP on $fm_file failed; returned logical start for lun $logical instead of 512"
+				return
+			fi
+			if (( tot_len != 512 )); then
+				error "FIEMAP on $fm_file failed; returned len $tot_len for OST $last_lun instead of 1024"
+				return
+			else
+				(( num_luns += 1 ))
+				tot_len=0
+			fi
+		fi
+		(( tot_len += ext_len ))
+		last_lun=$frag_lun
+	done
+	if (( num_luns != 2 || tot_len != 512 )); then
+		error "FIEMAP on $fm_file failed; returned wrong number of luns or wrong len for OST $last_lun"
+		return
+	fi
+
+	echo "FIEMAP on 2-stripe file with hole succeeded"
+}
+run_test 130c "FIEMAP (2-stripe file with hole)"
+
+test_130d() {
+	[ "$OSTCOUNT" -lt "3" ] && skip "skipping FIEMAP on N-stripe file test" && return
+
+	filefrag_op=$(filefrag -e 2>&1 | grep "invalid option")
+	[ -n "$filefrag_op" ] && skip "filefrag does not support FIEMAP" && return
+
+	local fm_file=$DIR/$tfile
+	lfs setstripe -s 65536 -c $OSTCOUNT $fm_file || error "setstripe failed on $fm_file"
+	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"
+	filefrag_op=`filefrag -ve $fm_file | grep -A 100 "ext:" | grep -v "ext:" | grep -v "found"`
+
+	last_lun=`echo $filefrag_op | cut -d: -f5`
+
+	IFS=$'\n'
+	tot_len=0
+	num_luns=1
+	for line in $filefrag_op
+	do
+		frag_lun=`echo $line | cut -d: -f5`
+		ext_len=`echo $line | cut -d: -f4`
+		if (( $frag_lun != $last_lun )); then
+			if (( tot_len != 1024 )); then
+				error "FIEMAP on $fm_file failed; returned len $tot_len for OST $last_lun instead of 1024"
+				return
+			else
+				(( num_luns += 1 ))
+				tot_len=0
+			fi
+		fi
+		(( tot_len += ext_len ))
+		last_lun=$frag_lun
+	done
+	if (( num_luns != OSTCOUNT || tot_len != 1024 )); then
+		error "FIEMAP on $fm_file failed; returned wrong number of luns or wrong len for OST $last_lun"
+		return
+	fi
+
+	echo "FIEMAP on N-stripe file succeeded"
+}
+run_test 130d "FIEMAP (N-stripe file)"
+
+test_130e() {
+	[ "$OSTCOUNT" -lt "2" ] && skip "skipping continuation FIEMAP test" && return
+
+	filefrag_op=$(filefrag -e 2>&1 | grep "invalid option")
+	[ -n "$filefrag_op" ] && skip "filefrag does not support FIEMAP" && return
+
+	local fm_file=$DIR/$tfile
+	lfs setstripe -s 65536 -c 2 $fm_file || error "setstripe failed on $fm_file"
+	NUM_BLKS=512
+	EXPECTED_LEN=$(( (NUM_BLKS / 2) * 4 ))
+	for ((i = 0; i < $NUM_BLKS; i++))
+	do
+		dd if=/dev/zero of=$fm_file count=1 bs=4096 seek=$((2*$i)) conv=notrunc > /dev/null 2>&1
+	done
+
+	filefrag -ves $fm_file || error "filefrag $fm_file failed"
+	filefrag_op=`filefrag -ve $fm_file | grep -A 750 "ext:" | grep -v "ext:" | grep -v "found"`
+
+	last_lun=`echo $filefrag_op | cut -d: -f5`
+
+	IFS=$'\n'
+	tot_len=0
+	num_luns=1
+	for line in $filefrag_op
+	do
+		frag_lun=`echo $line | cut -d: -f5`
+		ext_len=`echo $line | cut -d: -f4`
+		if (( $frag_lun != $last_lun )); then
+			if (( tot_len != $EXPECTED_LEN )); then
+				error "FIEMAP on $fm_file failed; returned len $tot_len for OST $last_lun instead of $EXPECTED_LEN"
+				return
+			else
+				(( num_luns += 1 ))
+				tot_len=0
+			fi
+		fi
+		(( tot_len += ext_len ))
+		last_lun=$frag_lun
+	done
+	if (( num_luns != 2 || tot_len != $EXPECTED_LEN )); then
+		echo "$num_luns $tot_len"
+		error "FIEMAP on $fm_file failed; returned wrong number of luns or wrong len for OST $last_lun"
+		return
+	fi
+
+	echo "FIEMAP with continuation calls succeeded"
+}
+run_test 130e "FIEMAP (test continuation FIEMAP calls)"
+
+# Test for writev/readv
+test_131a() {
+	rwv -f $DIR/$tfile -w -n 3 524288 1048576 1572864 || \
+	error "writev test failed"
+	rwv -f $DIR/$tfile -r -v -n 2 1572864 1048576 || \
+	error "readv failed"
+	rm -f $DIR/$tfile
+}
+run_test 131a "test iov's crossing stripe boundary for writev/readv"
+
+test_131b() {
+	rwv -f $DIR/$tfile -w -a -n 3 524288 1048576 1572864 || \
+	error "append writev test failed"
+	rwv -f $DIR/$tfile -w -a -n 2 1572864 1048576 || \
+	error "append writev test failed"
+	rm -f $DIR/$tfile
+}
+run_test 131b "test append writev"
+
+test_131c() {
+	rwv -f $DIR/$tfile -w -d -n 1 1048576 || return 0
+	error "NOT PASS"
+}
+run_test 131c "test read/write on file w/o objects"
+
+test_131d() {
+	rwv -f $DIR/$tfile -w -n 1 1572864
+	NOB=`rwv -f $DIR/$tfile -r -n 3 524288 524288 1048576 | awk '/error/ {print $6}'`
+	if [ "$NOB" != 1572864 ]; then
+		error "Short read filed: read $NOB bytes instead of 1572864"
+	fi
+	rm -f $DIR/$tfile
+}
+run_test 131d "test short read"
+
+test_131e() {
+	rwv -f $DIR/$tfile -w -s 1048576 -n 1 1048576
+	rwv -f $DIR/$tfile -r -z -s 0 -n 1 524288 || \
+	error "read hitting hole failed"
+	rm -f $DIR/$tfile
+}
+run_test 131e "test read hitting hole"
+
+test_140() { #bug-17379
+        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 8
+        local i=0
+        while i=`expr $i + 1`; do
+                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,
+                # not LBUGing the system is considered success,
+                # we didn't overrun the stack.
+                $OPENFILE -f O_RDONLY stat >/dev/null 2>&1; ret=$?
+                [ $ret -ne 0 ] && {
+                        if [ $ret -eq 40 ]; then
+                                break  # -ELOOP
+                        else
+                                error "Open stat symlink"
+                                return
+                        fi
+                }
+        done
+        i=`expr $i - 1`
+        [ $i -eq 5 -o $i -eq 8 ] || error "Invalid symlink depth"
+        echo "The symlink depth = $i"
+}
+run_test 140 "Check reasonable stack depth (shouldn't LBUG) ===="
+
+test_150() {
+	local TF="$TMP/$tfile"
+
+        dd if=/dev/urandom of=$TF bs=6096 count=1 || error "dd failed"
+        cp $TF $DIR/$tfile
+        cancel_lru_locks osc
+        cmp $TF $DIR/$tfile || error "$TMP/$tfile $DIR/$tfile differ"
+        remount_client $MOUNT
+        cmp $TF $DIR/$tfile || error "$TF $DIR/$tfile differ (remount)"
+
+        $TRUNCATE $TF 6000
+        $TRUNCATE $DIR/$tfile 6000
+        cancel_lru_locks osc
+        cmp $TF $DIR/$tfile || error "$TF $DIR/$tfile differ (truncate1)"
+
+        echo "12345" >>$TF
+        echo "12345" >>$DIR/$tfile
+        cancel_lru_locks osc
+        cmp $TF $DIR/$tfile || error "$TF $DIR/$tfile differ (append1)"
+
+        echo "12345" >>$TF
+        echo "12345" >>$DIR/$tfile
+        cancel_lru_locks osc
+        cmp $TF $DIR/$tfile || error "$TF $DIR/$tfile differ (append2)"
+
+        rm -f $TF
+        true
+}
+run_test 150 "truncate/append tests"
+
+function roc_access() {
+	ACCNUM=`$LCTL get_param -n obdfilter.*.stats | \
+		grep 'cache_access'| awk '{print $2}' | \
+		awk '{sum=sum+$3} END{print sum}'`
+	echo $ACCNUM
+}
+
+function roc_hit() {
+	ACCNUM=`$LCTL get_param -n obdfilter.*.stats | \
+		grep 'cache_hit'|awk '{print $2}' | \
+		awk '{sum=sum+$1} END{print sum}'`
+	echo $ACCNUM
+}
+
+test_151() {
+	local CPAGES=3
+
+	# check whether obdfilter is cache capable at all
+	if ! $LCTL get_param -n obdfilter.*.read_cache_enable; then
+		echo "not cache-capable obdfilter"
+		return 0
+	fi
+
+	# check cache is enabled on all obdfilters
+	if $LCTL get_param -n obdfilter.*.read_cache_enable | grep 0 >&/dev/null; then
+		echo "oss cache is disabled"
+		return 0
+	fi
+
+	$LCTL set_param -n obdfilter.*.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"
+	BEFORE=`roc_hit`
+        cancel_lru_locks osc
+	cat $DIR/$tfile >/dev/null
+	AFTER=`roc_hit`
+	if ! let "AFTER - BEFORE == CPAGES"; then
+		error "NOT IN CACHE: before: $BEFORE, after: $AFTER"
+	fi
+
+	# the following read invalidates the cache
+        cancel_lru_locks osc
+	$LCTL set_param -n obdfilter.*.read_cache_enable 0
+	cat $DIR/$tfile >/dev/null
+
+	# now data shouldn't be found in the cache
+	BEFORE=`roc_hit`
+        cancel_lru_locks osc
+	cat $DIR/$tfile >/dev/null
+	AFTER=`roc_hit`
+	if let "AFTER - BEFORE != 0"; then
+		error "IN CACHE: before: $BEFORE, after: $AFTER"
+	fi
+
+	$LCTL set_param -n obdfilter.*.read_cache_enable 1
+        rm -f $DIR/$tfile
+}
+run_test 151 "test cache on oss and controls ==============================="
+
+test_152() {
+        local TF="$TMP/$tfile"
+
+	# simulate ENOMEM during write
+#define OBD_FAIL_OST_NOMEM     	0x226
+        lctl set_param fail_loc=0x80000226
+        dd if=/dev/urandom of=$TF bs=6096 count=1 || error "dd failed"
+        cp $TF $DIR/$tfile
+        sync || error "sync failed"
+        lctl set_param fail_loc=0
+	
+        # discard client's cache
+        cancel_lru_locks osc
+
+        # simulate ENOMEM during read
+        lctl set_param fail_loc=0x80000226
+        cmp $TF $DIR/$tfile || error "cmp failed"
+        lctl set_param fail_loc=0
+
+	rm -f $TF
+}
+run_test 152 "test read/write with enomem ============================"
+
+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=$POOL_ROOT/dir_tst
+POOL_FILE=$POOL_ROOT/file_tst
+
+check_file_in_pool()
+{
+	file=$1
+	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
+	done
+	return 0
+}
+
+test_200a() {
+	remote_mds_nodsh && skip "remote MDS with nodsh" && return
+	do_facet mgs $LCTL pool_new $FSNAME.$POOL
+	do_facet mgs $LCTL get_param -n lov.$FSNAME-MDT0000-mdtlov.pools.$POOL
+	[ $? == 0 ] || error "Pool creation of $POOL failed"
+}
+run_test 200a "Create new pool =========================================="
+
+test_200b() {
+	remote_mds_nodsh && skip "remote MDS with nodsh" && return
+	TGT=$(seq -f $FSNAME-OST%04g_UUID $TGTPOOL_FIRST $TGTPOOL_STEP \
+		$TGTPOOL_MAX | tr '\n' ' ')
+	do_facet mgs $LCTL pool_add $FSNAME.$POOL \
+		$FSNAME-OST[$TGTPOOL_FIRST-$TGTPOOL_MAX/$TGTPOOL_STEP]_UUID
+	res=$(do_facet mgs $LCTL get_param -n lov.$FSNAME-MDT0000-mdtlov.pools.$POOL | sort \
+			| tr '\n' ' ')
+	[ "$res" = "$TGT" ] || error "Pool content ($res) do not match requested ($TGT)"
+}
+run_test 200b "Add targets to a pool ===================================="
+
+test_200c() {
+	remote_mds_nodsh && skip "remote MDS with nodsh" && return
+	mkdir -p $POOL_DIR
+	$SETSTRIPE -c 2 -p $POOL $POOL_DIR
+	[ $? = 0 ] || error "Cannot set pool $POOL to $POOL_DIR"
+}
+run_test 200c "Set pool on a directory ================================="
+
+test_200d() {
+	remote_mds_nodsh && skip "remote MDS with nodsh" && return
+	res=$($GETSTRIPE $POOL_DIR | grep pool: | cut -f8 -d " ")
+	[ "$res" = $POOL ] || error "Pool on $POOL_DIR is not $POOL"
+}
+run_test 200d "Check pool on a directory ==============================="
+
+test_200e() {
+	remote_mds_nodsh && skip "remote MDS with nodsh" && return
+	failed=0
+	for i in $(seq -w 1 $(($TGT_COUNT * 3)))
+	do
+		file=$POOL_DIR/file-$i
+		touch $file
+		check_file_in_pool $file
+		if [[ $? != 0 ]]
+		then
+			failed=$(($failed + 1))
+		fi
+	done
+	[ "$failed" = 0 ] || error "$failed files not allocated in $POOL"
+}
+run_test 200e "Check files allocation from directory pool =============="
+
+test_200f() {
+	remote_mds_nodsh && skip "remote MDS with nodsh" && return
+	mkdir -p $POOL_FILE
+	failed=0
+	for i in $(seq -w 1 $(($TGT_COUNT * 3)))
+	do
+		file=$POOL_FILE/spoo-$i
+		$SETSTRIPE -p $POOL $file
+		check_file_in_pool $file
+		if [[ $? != 0 ]]
+		then
+			failed=$(($failed + 1))
+		fi
+	done
+	[ "$failed" = 0 ] || error "$failed files not allocated in $POOL"
+}
+run_test 200f "Create files in a pool ==================================="
+
+test_200g() {
+	remote_mds_nodsh && skip "remote MDS with nodsh" && return
+	TGT=$(do_facet mgs $LCTL get_param -n lov.$FSNAME-MDT0000-mdtlov.pools.$POOL | head -1)
+	do_facet mgs $LCTL pool_remove $FSNAME.$POOL $TGT
+	res=$(do_facet mgs $LCTL get_param -n lov.$FSNAME-MDT0000-mdtlov.pools.$POOL | grep $TGT)
+	[ "$res" = "" ] || error "$TGT not removed from $FSNAME.$POOL"
+}
+run_test 200g "Remove a target from a pool ============================="
+
+test_200h() {
+	remote_mds_nodsh && skip "remote MDS with nodsh" && return
+	for TGT in $(do_facet mgs $LCTL get_param -n lov.$FSNAME-MDT0000-mdtlov.pools.$POOL)
+	do
+		do_facet mgs $LCTL pool_remove $FSNAME.$POOL $TGT
+ 	done
+	res=$(do_facet mgs $LCTL get_param -n lov.$FSNAME-MDT0000-mdtlov.pools.$POOL)
+	[ "$res" = "" ] || error "Pool $FSNAME.$POOL cannot be drained"
+}
+run_test 200h "Remove all targets from a pool =========================="
+
+test_200i() {
+	remote_mds_nodsh && skip "remote MDS with nodsh" && return
+	do_facet mgs $LCTL pool_destroy $FSNAME.$POOL
+	res=$(do_facet mgs "$LCTL get_param -n lov.$FSNAME-MDT0000-mdtlov.pools.$POOL 2>/dev/null")
+	[ "$res" = "" ] || error "Pool $FSNAME.$POOL is not destroyed"
+}
+run_test 200i "Remove a pool ============================================"
+
+test_212() {
+	size=`date +%s`
+	size=$((size % 8192 + 1))
+	dd if=/dev/urandom of=$DIR/f212 bs=1k count=$size
+	sendfile $DIR/f212 $DIR/f212.xyz || error "sendfile wrong"
+	rm -f $DIR/f212 $DIR/f212.xyz
+}
+run_test 212 "Sendfile test ============================================"
 
 TMPDIR=$OLDTMPDIR
 TMP=$OLDTMP