X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Ftests%2Fsanity.sh;h=dc8f270e3c9bcbcb1bd8495bb22cfdd81b089d06;hp=2d66bd540b4821488422f890274cc561772e8345;hb=73445b1142da4d3985cc79bcb44137c9e2b1fd8f;hpb=d8fa43506370879647bd7a08d8194b95c7976f33

diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh
index 2d66bd5..dc8f270 100644
--- a/lustre/tests/sanity.sh
+++ b/lustre/tests/sanity.sh
@@ -7,23 +7,47 @@
 set -e
 
 ONLY=${ONLY:-"$*"}
-# bug number for skipped test: 1979
-ALWAYS_EXCEPT=${ALWAYS_EXCEPT:-"42b"}
+# bug number for skipped test: 4900 4900 2108 9789 3637 9789 3561 5188/5749 10764
+ALWAYS_EXCEPT=${ALWAYS_EXCEPT:-"27o 27q  42a  42b  42c  42d  45   68        75"}
+# 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!
 
+[ "$SLOW" = "no" ] && EXCEPT="$EXCEPT 24o 27m 36f 36g 51b 51c 63 64b 71 73 101 115"
+
+# 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"
+
+# test76 is not valid with FIDs because inode numbers are not reused
+ALWAYS_EXCEPT="$ALWAYS_EXCEPT 76"
+
+case `uname -r` in
+2.4*) FSTYPE=${FSTYPE:-ext3} ;;
+2.6*) FSTYPE=${FSTYPE:-ldiskfs} ;;
+*) error "unsupported kernel" ;;
+esac
+
 SRCDIR=`dirname $0`
-PATH=$PWD/$SRCDIR:$SRCDIR:$SRCDIR/../utils:$PATH
+export PATH=$PWD/$SRCDIR:$SRCDIR:$SRCDIR/../utils:$PATH:/sbin
 
 TMP=${TMP:-/tmp}
 
 CHECKSTAT=${CHECKSTAT:-"checkstat -v"}
 CREATETEST=${CREATETEST:-createtest}
-LFIND=${LFIND:-lfind}
-LSTRIPE=${LSTRIPE:-lstripe}
+LFS=${LFS:-lfs}
+SETSTRIPE=${SETSTRIPE:-"$LFS setstripe"}
+GETSTRIPE=${GETSTRIPE:-"$LFS getstripe"}
+LSTRIPE=${LSTRIPE:-"$LFS setstripe"}
+LFIND=${LFIND:-"$LFS find"}
+LVERIFY=${LVERIFY:-ll_dirstripe_verify}
+LSTRIPEINFO=${LSTRIPEINFO:-ll_getstripe_info}
 LCTL=${LCTL:-lctl}
 MCREATE=${MCREATE:-mcreate}
 OPENFILE=${OPENFILE:-openfile}
 OPENUNLINK=${OPENUNLINK:-openunlink}
+RANDOM_READS=${RANDOM_READS:-"random-reads"}
 TOEXCL=${TOEXCL:-toexcl}
 TRUNCATE=${TRUNCATE:-truncate}
 MUNLINK=${MUNLINK:-munlink}
@@ -31,69 +55,130 @@ SOCKETSERVER=${SOCKETSERVER:-socketserver}
 SOCKETCLIENT=${SOCKETCLIENT:-socketclient}
 IOPENTEST1=${IOPENTEST1:-iopentest1}
 IOPENTEST2=${IOPENTEST2:-iopentest2}
+MEMHOG=${MEMHOG:-memhog}
+DIRECTIO=${DIRECTIO:-directio}
+ACCEPTOR_PORT=${ACCEPTOR_PORT:-988}
+UMOUNT=${UMOUNT:-"umount -d"}
+STRIPES_PER_OBJ=-1
 
 if [ $UID -ne 0 ]; then
+	echo "Warning: running as non-root uid $UID"
 	RUNAS_ID="$UID"
 	RUNAS=""
 else
 	RUNAS_ID=${RUNAS_ID:-500}
 	RUNAS=${RUNAS:-"runas -u $RUNAS_ID"}
+
+	# $RUNAS_ID may get set incorrectly somewhere else
+	if [ $RUNAS_ID -eq 0 ]; then
+		echo "Error: \$RUNAS_ID set to 0, but \$UID is also 0!"
+		exit 1
+	fi
 fi
 
+SANITYLOG=${SANITYLOG:-/tmp/sanity.log}
+
 export NAME=${NAME:-local}
 
 SAVE_PWD=$PWD
 
-clean() {
+LUSTRE=${LUSTRE:-`dirname $0`/..}
+. $LUSTRE/tests/test-framework.sh
+init_test_env $@
+. ${CONFIG:=$LUSTRE/tests/cfg/local.sh}
+
+if [ ! -z "$USING_KRB5" ]; then
+    $RUNAS krb5_login.sh || exit 1
+    $RUNAS -u $(($RUNAS_ID + 1)) krb5_login.sh || exit 1
+fi
+
+cleanup() {
 	echo -n "cln.."
-	sh llmountcleanup.sh > /dev/null || exit 20
-	I_MOUNTED=no
+	cleanupall ${FORCE} $* || { echo "FAILed to clean up"; exit 20; }
 }
-CLEAN=${CLEAN:-clean}
+CLEANUP=${CLEANUP:-:}
 
-start() {
+setup() {
 	echo -n "mnt.."
-	sh llrmount.sh > /dev/null || exit 10
-	I_MOUNTED=yes
+        load_modules
+	setupall || exit 10
 	echo "done"
 }
-START=${START:-start}
+SETUP=${SETUP:-:}
 
 log() {
 	echo "$*"
-	lctl mark "$*" 2> /dev/null || true
+	$LCTL mark "$*" 2> /dev/null || true
+}
+
+trace() {
+	log "STARTING: $*"
+	strace -o $TMP/$1.strace -ttt $*
+	RC=$?
+	log "FINISHED: $*: rc $RC"
+	return 1
+}
+TRACE=${TRACE:-""}
+
+check_kernel_version() {
+	VERSION_FILE=$LPROC/version
+	WANT_VER=$1
+	[ ! -f $VERSION_FILE ] && echo "can't find kernel version" && return 1
+	GOT_VER=$(awk '/kernel:/ {print $2}' $VERSION_FILE)
+	[ $GOT_VER == "patchless" ] && return 0
+	[ $GOT_VER -ge $WANT_VER ] && return 0
+	log "test needs at least kernel version $WANT_VER, running $GOT_VER"
+	return 1
+}
+
+_basetest() {
+    echo $*
+}
+
+basetest() {
+    IFS=abcdefghijklmnopqrstuvwxyz _basetest $1
 }
 
 run_one() {
-	if ! mount | grep -q $DIR; then
-		$START
+	if ! grep -q $DIR /proc/mounts; then
+		$SETUP
 	fi
-	log "== test $1: $2"
-	test_$1 || error "test_$1: $?"
-	pass
+	testnum=$1
+	message=$2
+	BEFORE=`date +%s`
+	log "== test $testnum: $message= `date +%H:%M:%S` ($BEFORE)"
+	export TESTNAME=test_$testnum
+	export tfile=f${testnum}
+	export tdir=d${base}
+	test_${testnum} || error "exit with rc=$?"
+	unset TESTNAME
+	pass "($((`date +%s` - $BEFORE))s)"
 	cd $SAVE_PWD
-	$CLEAN
+	$CLEANUP
 }
 
 build_test_filter() {
+	[ "$ALWAYS_EXCEPT$EXCEPT$SANITY_EXCEPT" ] && \
+	    echo "Skipping tests: `echo $ALWAYS_EXCEPT $EXCEPT $SANITY_EXCEPT`"
+
         for O in $ONLY; do
             eval ONLY_${O}=true
         done
-        for E in $EXCEPT $ALWAYS_EXCEPT; do
+        for E in $EXCEPT $ALWAYS_EXCEPT $SANITY_EXCEPT; do
             eval EXCEPT_${E}=true
         done
 }
 
 _basetest() {
-    echo $*
+	echo $*
 }
 
 basetest() {
-    IFS=abcdefghijklmnopqrstuvwxyz _basetest $1
+	IFS=abcdefghijklmnopqrstuvwxyz _basetest $1
 }
 
 run_test() {
-         base=`basetest $1`
+         export base=`basetest $1`
          if [ "$ONLY" ]; then
                  testname=ONLY_$1
                  if [ ${!testname}x != x ]; then
@@ -110,12 +195,12 @@ run_test() {
  	fi
         testname=EXCEPT_$1
         if [ ${!testname}x != x ]; then
-                 echo "skipping excluded test $1"
+                 TESTNAME=test_$1 skip "skipping excluded test $1"
                  return 0
         fi
         testname=EXCEPT_$base
         if [ ${!testname}x != x ]; then
-                 echo "skipping excluded test $1 (base $base)"
+                 TESTNAME=test_$1 skip "skipping excluded test $1 (base $base)"
                  return 0
         fi
         run_one $1 "$2"
@@ -125,33 +210,50 @@ run_test() {
 [ "$SANITYLOG" ] && rm -f $SANITYLOG || true
 
 error() { 
-	log "FAIL: $@"
+	sysctl -w lustre.fail_loc=0
+	log "$0: FAIL: $TESTNAME $@"
+	$LCTL dk $TMP/lustre-log-$TESTNAME.log
 	if [ "$SANITYLOG" ]; then
-		echo "FAIL: $@" >> $SANITYLOG
+		echo "$0: FAIL: $TESTNAME $@" >> $SANITYLOG
 	else
 		exit 1
 	fi
+	sysctl -w lustre.fail_loc=0
 }
 
 pass() { 
-	echo PASS
+	echo PASS $@
+}
+
+skip () {
+	log "$0: SKIP: $TESTNAME $@"
+	[ "$SANITYLOG" ] && echo "$0: SKIP: $TESTNAME $@" >> $SANITYLOG
+
+}
+
+mounted_lustre_filesystems() {
+	awk '($3 ~ "lustre" && $1 ~ ":") { print $2 }' /proc/mounts
 }
 
-MOUNT="`mount | awk '/^'$NAME' .* lustre_lite / { print $3 }'`"
-if [ -z "$MOUNT" ]; then
-	sh llmount.sh
-	MOUNT="`mount | awk '/^'$NAME' .* lustre_lite / { print $3 }'`"
-	[ -z "$MOUNT" ] && error "NAME=$NAME not mounted"
+MOUNTED="`mounted_lustre_filesystems`"
+if [ -z "$MOUNTED" ]; then
+        formatall
+	setupall
+	MOUNTED="`mounted_lustre_filesystems`"
+	[ -z "$MOUNTED" ] && error "NAME=$NAME not mounted"
 	I_MOUNTED=yes
 fi
 
-[ `echo $MOUNT | wc -w` -gt 1 ] && error "NAME=$NAME mounted more than once"
-
 DIR=${DIR:-$MOUNT}
 [ -z "`echo $DIR | grep $MOUNT`" ] && echo "$DIR not in $MOUNT" && exit 99
 
-LOVNAME=`cat /proc/fs/lustre/llite/fs0/lov/common_name`
-STRIPECOUNT=`cat /proc/fs/lustre/lov/$LOVNAME/numobd`
+LOVNAME=`cat $LPROC/llite/*/lov/common_name | tail -n 1`
+OSTCOUNT=`cat $LPROC/lov/$LOVNAME/numobd`
+STRIPECOUNT=`cat $LPROC/lov/$LOVNAME/stripecount`
+STRIPESIZE=`cat $LPROC/lov/$LOVNAME/stripesize`
+ORIGFREE=`cat $LPROC/lov/$LOVNAME/kbytesavail`
+MAXFREE=${MAXFREE:-$((200000 * $OSTCOUNT))}
+MDS=$(\ls $LPROC/mdt 2> /dev/null | grep -v num_refs | tail -n 1)
 
 [ -f $DIR/d52a/foo ] && chattr -a $DIR/d52a/foo
 [ -f $DIR/d52b/foo ] && chattr -i $DIR/d52b/foo
@@ -159,22 +261,37 @@ rm -rf $DIR/[Rdfs][1-9]*
 
 build_test_filter
 
-echo preparing for tests involving mounts
-EXT2_DEV=${EXT2_DEV:-/tmp/SANITY.LOOP}
+if [ "${ONLY}" = "MOUNT" ] ; then 
+	echo "Lustre is up, please go on"
+	exit
+fi
+
+echo "preparing for tests involving mounts"
+EXT2_DEV=${EXT2_DEV:-$TMP/SANITY.LOOP}
 touch $EXT2_DEV
-mke2fs -F $EXT2_DEV 1000 > /dev/null
+mke2fs -j -F $EXT2_DEV 8000 > /dev/null
+echo # add a newline after mke2fs.
+
+umask 077
 
 test_0() {
-	touch $DIR/f
-	$CHECKSTAT -t file $DIR/f || error
-	rm $DIR/f
-	$CHECKSTAT -a $DIR/f || error
+	touch $DIR/$tfile
+	$CHECKSTAT -t file $DIR/$tfile || error
+	rm $DIR/$tfile
+	$CHECKSTAT -a $DIR/$tfile || error
 }
-run_test 0 "touch .../f ; rm .../f ============================="
+run_test 0 "touch .../$tfile ; rm .../$tfile ====================="
+
+test_0b() {
+	chmod 0755 $DIR || error
+	$CHECKSTAT -p 0755 $DIR || error
+}
+run_test 0b "chmod 0755 $DIR ============================="
 
 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
 }
 run_test 1a "mkdir .../d1; mkdir .../d1/d2 ====================="
@@ -251,7 +368,7 @@ test_6a() {
 run_test 6a "touch .../f6a; chmod .../f6a ======================"
 
 test_6b() {
-	[ $RUNAS_ID -eq $UID ] && echo "skipping test 6b" && return
+	[ $RUNAS_ID -eq $UID ] && skip "RUNAS_ID = UID = $UID -- skipping" && return
 	if [ ! -f $DIR/f6a ]; then
 		touch $DIR/f6a
 		chmod 0666 $DIR/f6a
@@ -262,7 +379,7 @@ test_6b() {
 run_test 6b "$RUNAS chmod .../f6a (should return error) =="
 
 test_6c() {
-	[ $RUNAS_ID -eq $UID ] && echo "skipping test 6c" && return
+	[ $RUNAS_ID -eq $UID ] && skip "RUNAS_ID = UID = $UID -- skipping" && return
 	touch $DIR/f6c
 	chown $RUNAS_ID $DIR/f6c || error
 	$CHECKSTAT -t file -u \#$RUNAS_ID $DIR/f6c || error
@@ -270,7 +387,7 @@ test_6c() {
 run_test 6c "touch .../f6c; chown .../f6c ======================"
 
 test_6d() {
-	[ $RUNAS_ID -eq $UID ] && echo "skipping test 6d" && return
+	[ $RUNAS_ID -eq $UID ] && skip "RUNAS_ID = UID = $UID -- skipping" && return
 	if [ ! -f $DIR/f6c ]; then
 		touch $DIR/f6c
 		chown $RUNAS_ID $DIR/f6c
@@ -281,7 +398,7 @@ test_6d() {
 run_test 6d "$RUNAS chown .../f6c (should return error) =="
 
 test_6e() {
-	[ $RUNAS_ID -eq $UID ] && echo "skipping test 6e" && return
+	[ $RUNAS_ID -eq $UID ] && skip "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
@@ -289,7 +406,7 @@ test_6e() {
 run_test 6e "touch .../f6e; chgrp .../f6e ======================"
 
 test_6f() {
-	[ $RUNAS_ID -eq $UID ] && echo "skipping test 6f" && return
+	[ $RUNAS_ID -eq $UID ] && skip "RUNAS_ID = UID = $UID -- skipping" && return
 	if [ ! -f $DIR/f6e ]; then
 		touch $DIR/f6e
 		chgrp $RUNAS_ID $DIR/f6e
@@ -300,7 +417,7 @@ test_6f() {
 run_test 6f "$RUNAS chgrp .../f6e (should return error) =="
 
 test_6g() {
-	[ $RUNAS_ID -eq $UID ] && echo "skipping test 6g" && return
+	[ $RUNAS_ID -eq $UID ] && skip "RUNAS_ID = UID = $UID -- skipping" && return
         mkdir $DIR/d6g || error
         chmod 777 $DIR/d6g || error
         $RUNAS mkdir $DIR/d6g/d || error
@@ -310,6 +427,15 @@ test_6g() {
 }
 run_test 6g "Is new dir in sgid dir inheriting group?"
 
+test_6h() { # bug 7331
+	[ $RUNAS_ID -eq $UID ] && skip "RUNAS_ID = UID = $UID -- skipping" && return
+	touch $DIR/f6h || error "touch failed"
+	chown $RUNAS_ID:$RUNAS_ID $DIR/f6h || error "initial chown failed"
+	$RUNAS -G$RUNAS_ID chown $RUNAS_ID:0 $DIR/f6h && error "chown worked"
+	$CHECKSTAT -t file -u \#$RUNAS_ID -g \#$RUNAS_ID $DIR/f6h || error
+}
+run_test 6h "$RUNAS chown RUNAS_ID.0 .../f6h (should return error)"
+
 test_7a() {
 	mkdir $DIR/d7
 	$MCREATE $DIR/d7/f
@@ -404,30 +530,54 @@ test_16() {
 run_test 16 "touch .../d16/f; rm -rf .../d16/f ================="
 
 test_17a() {
-	mkdir $DIR/d17
+	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/l-exist
-	$CHECKSTAT -a $DIR/l-exist || error
+	rm -f $DIR/d17/l-exist
+	$CHECKSTAT -a $DIR/d17/l-exist || error
 }
 run_test 17a "symlinks: create, remove (real) =================="
 
 test_17b() {
-	if [ ! -d $DIR/d17 ]; then
-		mkdir $DIR/d17
-	fi
+	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/l-dangle
-	$CHECKSTAT -a $DIR/l-dangle || error
+	rm -f $DIR/d17/l-dangle
+	$CHECKSTAT -a $DIR/d17/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
+}
+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"
+}
+run_test 17d "symlinks: create dangling ========================"
+
+test_17f() {
+	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
+	ln -s 1234567890/2234567890/3234567890/4234567890/5234567890/6234567890/7234567890/8234567890/9234567890/a234567890/b234567890 $DIR/d17f/444
+	ln -s 1234567890/2234567890/3234567890/4234567890/5234567890/6234567890/7234567890/8234567890/9234567890/a234567890/b234567890/c234567890/d234567890/f234567890 $DIR/d17f/555
+	ln -s 1234567890/2234567890/3234567890/4234567890/5234567890/6234567890/7234567890/8234567890/9234567890/a234567890/b234567890/c234567890/d234567890/f234567890/aaaaaaaaaa/bbbbbbbbbb/cccccccccc/dddddddddd/eeeeeeeeee/ffffffffff/ $DIR/d17f/666
+	ls -l  $DIR/d17f
+}
+run_test 17f "symlinks: long and very long symlink name ========================"
+
 test_18() {
 	touch $DIR/f
 	ls $DIR || error
@@ -448,7 +598,7 @@ test_19b() {
 run_test 19b "ls -l .../f19 (should return error) =============="
 
 test_19c() {
-	[ $RUNAS_ID -eq $UID ] && echo "skipping test 19c" && return
+	[ $RUNAS_ID -eq $UID ] && skip "RUNAS_ID = UID = $UID -- skipping" && return
 	$RUNAS touch $DIR/f19 && error || true
 }
 run_test 19c "$RUNAS touch .../f19 (should return error) =="
@@ -484,15 +634,15 @@ test_21() {
 run_test 21 "write to dangling link ============================"
 
 test_22() {
-	mkdir $DIR/d22
-	chown $RUNAS_ID $DIR/d22
-	# Tar gets pissy if it can't access $PWD *sigh*
-	(cd /tmp;
+	WDIR=$DIR/$tdir
+	mkdir $WDIR
+	chown $RUNAS_ID $WDIR
+	(cd $WDIR || error "cd $WDIR failed";
 	$RUNAS tar cf - /etc/hosts /etc/sysconfig/network | \
-	$RUNAS tar xfC - $DIR/d22)
-	ls -lR $DIR/d22/etc
-	$CHECKSTAT -t dir $DIR/d22/etc || error
-	$CHECKSTAT -u \#$RUNAS_ID $DIR/d22/etc || error
+	$RUNAS tar xf -)
+	ls -lR $WDIR/etc || error "ls -lR $WDIR/etc failed"
+	$CHECKSTAT -t dir $WDIR/etc || error "checkstat -t dir failed"
+	$CHECKSTAT -u \#$RUNAS_ID $WDIR/etc || error "checkstat -u failed"
 }
 run_test 22 "unpack tar archive as non-root user ==============="
 
@@ -534,7 +684,7 @@ run_test 24c "mkdir .../R3/f; rename .../R3/f .../R3/g ========="
 test_24d() {
 	mkdir $DIR/R4
 	mkdir $DIR/R4/{f,g}
-	perl -e "rename \"$DIR/R4/f\", \"$DIR/R4/g\";"
+	mrename $DIR/R4/f $DIR/R4/g
 	$CHECKSTAT -a $DIR/R4/f || error
 	$CHECKSTAT -t dir $DIR/R4/g || error
 }
@@ -566,23 +716,23 @@ test_24g() {
 	$CHECKSTAT -a $DIR/R7a/d || error
 	$CHECKSTAT -t dir $DIR/R7b/e || error
 }
-run_test 24g "mkdir .../R7a/d; rename .../R7a/d .../R5b/e ======"
+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
-	perl -e "rename \"$DIR/R8a/d\", \"$DIR/R8b/e\";"
+	mrename $DIR/R8a/d $DIR/R8b/e
 	$CHECKSTAT -a $DIR/R8a/d || error
 	$CHECKSTAT -t dir $DIR/R8b/e || error
 }
-run_test 24h "mkdir .../R8{a,b} R8a/{d,e}; mv .../R8a/d .../R8b/e"
+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
 	touch $DIR/R9/f
-	perl -e "rename \"$DIR/R9/f\", \"$DIR/R9/a\";"
+	mrename $DIR/R9/f $DIR/R9/a
 	$CHECKSTAT -t file $DIR/R9/f || error
 	$CHECKSTAT -t dir  $DIR/R9/a || error
 	$CHECKSTAT -a file $DIR/R9/a/f || error
@@ -591,7 +741,7 @@ run_test 24i "rename file to dir error: touch f ; mkdir a ; rename f a"
 
 test_24j() {
 	mkdir $DIR/R10
-	perl -e "rename \"$DIR/R10/f\", \"$DIR/R10/g\"" 
+	mrename $DIR/R10/f $DIR/R10/g
 	$CHECKSTAT -t dir $DIR/R10 || error
 	$CHECKSTAT -a $DIR/R10/f || error
 	$CHECKSTAT -a $DIR/R10/g || error
@@ -602,13 +752,100 @@ test_24k() {
 	mkdir $DIR/R11a $DIR/R11a/d
 	touch $DIR/R11a/f
 	mv $DIR/R11a/f $DIR/R11a/d
-	$CHECKSTAT -a $DIR/R11a/f || error
-	$CHECKSTAT -t file $DIR/R11a/d/f || error
+        $CHECKSTAT -a $DIR/R11a/f || error
+        $CHECKSTAT -t file $DIR/R11a/d/f || error
 }
 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
+}
+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"
+	# 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"
+	$CHECKSTAT -t file ${f}2 || error "${f}2 missing"
+}
+run_test 24m "Renaming a file to a hard link to itself ========="
+
+test_24n() {
+    f="$DIR/f24n"
+    # this stats the old file after it was renamed, so it should fail
+    touch ${f}
+    $CHECKSTAT ${f}
+    mv ${f} ${f}.rename
+    $CHECKSTAT ${f}.rename
+    $CHECKSTAT -a ${f}
+}
+run_test 24n "Statting the old file after renaming (Posix rename 2)"
+
+test_24o() {
+	check_kernel_version 37 || return 0
+	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}
+	DIRINO=`ls -lid $DIR/R12a | awk '{ print $1 }'`
+	mrename $DIR/R12a $DIR/R12b
+	$CHECKSTAT -a $DIR/R12a || error
+	$CHECKSTAT -t dir $DIR/R12b || error
+	DIRINO2=`ls -lid $DIR/R12b | awk '{ print $1 }'`
+	[ "$DIRINO" = "$DIRINO2" ] || error "R12a $DIRINO != R12b $DIRINO2"
+}
+run_test 24p "mkdir .../R12{a,b}; rename .../R12a .../R12b"
+
+test_24q() {
+	mkdir $DIR/R13{a,b}
+	DIRINO=`ls -lid $DIR/R13a | awk '{ print $1 }'`
+	multiop $DIR/R13b D_c &
+	MULTIPID=$!
+	usleep 500
+
+	mrename $DIR/R13a $DIR/R13b
+	$CHECKSTAT -a $DIR/R13a || error
+	$CHECKSTAT -t dir $DIR/R13b || error
+	DIRINO2=`ls -lid $DIR/R13b | awk '{ print $1 }'`
+	[ "$DIRINO" = "$DIRINO2" ] || error "R13a $DIRINO != R13b $DIRINO2"
+	kill -USR1 $MULTIPID
+	wait $MULTIPID || error "multiop close failed"
+}
+run_test 24q "mkdir .../R13{a,b}; open R13b rename R13a R13b ==="
+
+test_24r() { #bug 3789
+	mkdir $DIR/R14a $DIR/R14a/b
+	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"
+}
+run_test 24r "mkdir .../R14a/b; rename .../R14a .../R14a/b ====="
+
+test_24s() {
+	mkdir $DIR/R15a $DIR/R15a/b $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
+	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"
+}
+run_test 24t "mkdir .../R16a/b/c; rename .../R16a/b/c .../R16a ="
+
 test_25a() {
 	echo '== symlink sanity ============================================='
+
 	mkdir $DIR/d25
 	ln -s d25 $DIR/s25
 	touch $DIR/s25/foo || error
@@ -616,9 +853,7 @@ test_25a() {
 run_test 25a "create file in symlinked directory ==============="
 
 test_25b() {
-	if [ ! -d $DIR/d25 ]; then
-		run_one	25a
-	fi
+	[ ! -d $DIR/d25 ] && test_25a
 	$CHECKSTAT -t file $DIR/s25/foo || error
 }
 run_test 25b "lookup file in symlinked directory ==============="
@@ -655,131 +890,336 @@ test_26d() {
 run_test 26d "create multiple component recursive symlink ======"
 
 test_26e() {
-	if [ ! -h $DIR/d26-3 ]; then
-		run_one 26d
-	fi
+	[ ! -h $DIR/d26-3 ] && test_26d
 	rm $DIR/d26-3
 }
 run_test 26e "unlink multiple component recursive symlink ======"
 
+# recursive symlinks (bug 7022)
+test_26f() {
+	mkdir $DIR/$tfile        || error "mkdir $DIR/$tfile failed"
+	cd $DIR/$tfile           || error "cd $DIR/$tfile failed"
+	mkdir -p $tdir/bar1      || error "mkdir $tdir/bar1 failed"
+	mkdir $tfile             || error "mkdir $tfile failed"
+	cd $tfile                || error "cd $tfile failed"
+	ln -s .. dotdot          || error "ln dotdot failed"
+	ln -s dotdot/$tdir $tdir || error "ln $tdir failed"
+	cd ../..                 || error "cd ../.. failed"
+	output=`ls $tfile/$tfile/$tdir/bar1`
+	[ "$output" = bar1 ] && error "unexpected output"
+	rm -r $tfile             || error "rm $tfile failed"
+	$CHECKSTAT -a $DIR/$tfile || error "$tfile not gone"
+}
+run_test 26f "rm -r of a directory which has recursive symlink ="
+
 test_27a() {
 	echo '== stripe sanity =============================================='
-	mkdir $DIR/d27
-	$LSTRIPE $DIR/d27/f0 8192 0 1 || error
-	$CHECKSTAT -t file $DIR/d27/f0 || error
+	mkdir -p $DIR/d27 || error "mkdir failed"
+	$SETSTRIPE $DIR/d27/f0 65536 0 1 || error "lstripe failed"
+	$CHECKSTAT -t file $DIR/d27/f0 || error "checkstat failed"
 	pass
-	log "== test_27b: write to one stripe file ========================="
+	log "== test_27a: write to one stripe file ========================="
 	cp /etc/hosts $DIR/d27/f0 || error
 }
 run_test 27a "one stripe file =================================="
 
 test_27c() {
-	[ "$STRIPECOUNT" -lt "2" ] && echo "skipping 2-stripe test" && return
-	if [ ! -d $DIR/d27 ]; then
-		mkdir $DIR/d27
-	fi
-	$LSTRIPE $DIR/d27/f01 8192 0 2 || error
-	[ `$LFIND $DIR/d27/f01 | grep -A 10 obdidx | wc -l` -eq 4 ] ||
+	[ "$OSTCOUNT" -lt "2" ] && skip "skipping 2-stripe test" && return
+	mkdir -p $DIR/d27
+	$SETSTRIPE $DIR/d27/f01 65536 0 2 || error "lstripe failed"
+	[ `$GETSTRIPE $DIR/d27/f01 | grep -A 10 obdidx | wc -l` -eq 4 ] ||
 		error "two-stripe file doesn't have two stripes"
 	pass
 	log "== test_27d: write to two stripe file file f01 ================"
-	dd if=/dev/zero of=$DIR/d27/f01 bs=4k count=4 || error
+	dd if=/dev/zero of=$DIR/d27/f01 bs=4k count=4 || error "dd failed"
 }
 run_test 27c "create two stripe file f01 ======================="
 
 test_27d() {
-	if [ ! -d $DIR/d27 ]; then
-		mkdir $DIR/d27
-	fi
-	$LSTRIPE $DIR/d27/fdef 0 -1 0 || error
-	$CHECKSTAT -t file $DIR/d27/fdef || error
-	#dd if=/dev/zero of=$DIR/d27/fdef bs=4k count=4 || error
+	mkdir -p $DIR/d27
+	$SETSTRIPE $DIR/d27/fdef 0 -1 0 || 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
 }
 run_test 27d "create file with default settings ================"
 
 test_27e() {
-	if [ ! -d $DIR/d27 ]; then
-		mkdir $DIR/d27
-	fi
-	$LSTRIPE $DIR/d27/f12 8192 0 2 || error
-	$LSTRIPE $DIR/d27/f12 8192 0 2 && error
-	$CHECKSTAT -t file $DIR/d27/f12 || error
+	mkdir -p $DIR/d27
+	$SETSTRIPE $DIR/d27/f12 65536 0 2 || error "lstripe failed"
+	$SETSTRIPE $DIR/d27/f12 65536 0 2 && error "lstripe succeeded twice"
+	$CHECKSTAT -t file $DIR/d27/f12 || error "checkstat failed"
 }
 run_test 27e "lstripe existing file (should return error) ======"
 
 test_27f() {
-	if [ ! -d $DIR/d27 ]; then
-		mkdir $DIR/d27
-	fi
-	$LSTRIPE $DIR/d27/fbad 100 0 1 && error
-	dd if=/dev/zero of=$DIR/d27/f12 bs=4k count=4 || error
-	$LFIND $DIR/d27/fbad || error
+	mkdir -p $DIR/d27
+	$SETSTRIPE $DIR/d27/fbad 100 0 1 && error "lstripe failed"
+	dd if=/dev/zero of=$DIR/d27/f12 bs=4k count=4 || error "dd failed"
+	$GETSTRIPE $DIR/d27/fbad || error "lfs getstripe failed"
 }
 run_test 27f "lstripe with bad stripe size (should return error)"
 
 test_27g() {
-	if [ ! -d $DIR/d27 ]; then
-		mkdir $DIR/d27
-	fi
-	$MCREATE $DIR/d27/fnone || error
+	mkdir -p $DIR/d27
+	$MCREATE $DIR/d27/fnone || error "mcreate failed"
 	pass
-	log "== test 27h: lfind with no objects ============================"
-	$LFIND $DIR/d27/fnone 2>&1 | grep -q "no stripe info" || error
+	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: lfind with some objects =========================="
-	touch $DIR/d27/fsome || error
-	$LFIND $DIR/d27/fsome | grep -q obdidx || error
+	log "== test 27i: lfs getstripe with some objects =================="
+	touch $DIR/d27/fsome || error "touch failed"
+	$GETSTRIPE $DIR/d27/fsome | grep obdidx || error "missing objects"
 }
-run_test 27g "test lfind ======================================="
+run_test 27g "test lfs getstripe ==========================================="
 
 test_27j() {
-        if [ ! -d $DIR/d27 ]; then
-                mkdir $DIR/d27
-        fi
-        $LSTRIPE $DIR/d27/f27j 8192 $STRIPECOUNT 1 && error || true
+	mkdir -p $DIR/d27
+	$SETSTRIPE $DIR/d27/f27j 65536 $OSTCOUNT 1 && error "lstripe failed"||true
 }
 run_test 27j "lstripe with bad stripe offset (should return error)"
 
+test_27k() { # bug 2844
+	mkdir -p $DIR/d27
+	FILE=$DIR/d27/f27k
+	LL_MAX_BLKSIZE=$((4 * 1024 * 1024))
+	[ ! -d $DIR/d27 ] && mkdir -p $DIR/d27
+	$SETSTRIPE $FILE 67108864 -1 0 || error "lstripe 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
+	BLKSIZE=`stat $FILE | awk '/IO Block:/ { print $7 }'`
+	[ $BLKSIZE -le $LL_MAX_BLKSIZE ] || error "$BLKSIZE > $LL_MAX_BLKSIZE"
+}
+run_test 27k "limit i_blksize for broken user apps ============="
+
+test_27l() {
+	mkdir -p $DIR/d27
+	mcreate $DIR/f27l || error "creating file"
+	$RUNAS $SETSTRIPE $DIR/f27l 65536 -1 1 && \
+		error "lstripe should have failed" || true
+}
+run_test 27l "check setstripe permissions (should return error)"
+
+test_27m() {
+	[ "$OSTCOUNT" -lt "2" ] && skip "$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 0 0 1
+	dd if=/dev/zero of=$DIR/d27/f27m_1 bs=1024 count=$MAXFREE && \
+		error "dd should fill OST0"
+	i=2
+	while $SETSTRIPE $DIR/d27/f27m_$i 0 0 1 ; 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"` ] && \
+		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"` ] && \
+		error "OST0 was full but new created file still use it"
+	rm -r $DIR/d27
+	sleep 15
+}
+run_test 27m "create file while OST0 was full =================="
+
+# osc's keep a NOSPC stick flag that gets unset with rmdir
+reset_enospc() {
+	[ "$1" ] && FAIL_LOC=$1 || FAIL_LOC=0
+	mkdir -p $DIR/d27/nospc
+	rmdir $DIR/d27/nospc
+	sysctl -w lustre.fail_loc=$FAIL_LOC
+}
+
+exhaust_precreations() {
+	OSTIDX=$1
+	OST=$(grep ${OSTIDX}": " $LPROC/lov/${LOVNAME}/target_obd | \
+	    awk '{print $2}' | sed -e 's/_UUID$//')
+	# on the mdt's osc
+        OSC=$(ls $LPROC/osc | grep "${OST}-osc-MDT0000")
+        last_id=$(cat $LPROC/osc/${OSC}/prealloc_last_id)
+	next_id=$(cat $LPROC/osc/${OSC}/prealloc_next_id)
+
+        mkdir -p $DIR/d27/${OST}
+	$SETSTRIPE $DIR/d27/${OST} 0 $OSTIDX 1
+#define OBD_FAIL_OST_ENOSPC              0x215
+	sysctl -w lustre.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))
+	grep '[0-9]' $LPROC/osc/${OSC}/prealloc*
+	reset_enospc $2
+}
+
+exhaust_all_precreations() {
+	local i
+	for (( i=0; i < OSTCOUNT; i++ )) ; do
+		exhaust_precreations $i 0x215
+	done
+	reset_enospc $1
+}
+
+test_27n() {
+	[ "$OSTCOUNT" -lt "2" -o -z "$MDS" ] && \
+		skip "too few OSTs, or remote MDS" && return
+
+	reset_enospc
+	rm -f $DIR/d27/f27n
+	exhaust_precreations 0 0x80000215
+
+	touch $DIR/d27/f27n || error
+
+	reset_enospc
+}
+run_test 27n "create file with some full OSTs =================="
+
+test_27o() {
+	[ "$OSTCOUNT" -lt "2" -o -z "$MDS" ] && \
+		skip "too few OSTs, or remote MDS" && return
+
+	reset_enospc
+	rm -f $DIR/d27/f27o
+	exhaust_all_precreations 0x215
+	sleep 5
+
+	touch $DIR/d27/f27o && error "able to create $DIR/d27/f27o"
+
+	reset_enospc
+	rm -rf $DIR/d27/*
+}
+run_test 27o "create file with all full OSTs (should error) ===="
+
+test_27p() {
+	[ "$OSTCOUNT" -lt "2" -o -z "$MDS" ] && \
+		skip "too few OSTs, or remote MDS" && return
+
+	reset_enospc
+	rm -f $DIR/d27/f27p
+
+	$MCREATE $DIR/d27/f27p || error
+	$TRUNCATE $DIR/d27/f27p 80000000 || error
+	$CHECKSTAT -s 80000000 $DIR/d27/f27p || error
+
+	exhaust_precreations 0 0x80000215
+	echo foo >> $DIR/d27/f27p || error
+	$CHECKSTAT -s 80000004 $DIR/d27/f27p || error
+
+	reset_enospc
+}
+run_test 27p "append to a truncated file with some full OSTs ==="
+
+test_27q() {
+	[ "$OSTCOUNT" -lt "2" -o -z "$MDS" ] && \
+		skip "too few OSTs, or remote MDS" && return
+
+	reset_enospc
+	rm -f $DIR/d27/f27q
+
+	$MCREATE $DIR/d27/f27q || error "mcreate $DIR/d27/f27q failed"
+	$TRUNCATE $DIR/d27/f27q 80000000 ||error "truncate $DIR/d27/f27q failed"
+	$CHECKSTAT -s 80000000 $DIR/d27/f27q || error "checkstat failed"
+
+	exhaust_all_precreations 0x215
+
+	echo foo >> $DIR/d27/f27q && error "append succeeded"
+	$CHECKSTAT -s 80000000 $DIR/d27/f27q || error "checkstat 2 failed"
+
+	reset_enospc
+}
+run_test 27q "append to truncated file with all OSTs full (should error) ==="
+
+test_27r() {
+	[ "$OSTCOUNT" -lt "2" -o -z "$MDS" ] && \
+		skip "too few OSTs, or remote MDS" && return
+
+	reset_enospc
+	rm -f $DIR/d27/f27r
+	exhaust_precreations 0 0x80000215
+
+	$SETSTRIPE $DIR/d27/f27r 0 0 2 # && error
+
+	reset_enospc
+}
+run_test 27r "stripe file with some full OSTs (shouldn't LBUG) ="
+
+test_27s() { # bug 10725
+       mkdir -p $DIR/$tdir
+       $LSTRIPE $DIR/$tdir $((2048 * 1024 * 1024)) -1 2 && \
+               error "stripe width >= 2^32 succeeded" || true
+}
+run_test 27s "lsm_xfersize overflow (should error) (bug 10725)"
+
+test_27t() { # bug 10864
+        WDIR=`pwd`
+        WLFS=`which lfs`
+        cd $DIR
+        touch $tfile
+        $WLFS getstripe $tfile
+        cd $WDIR
+}
+run_test 27t "check that utils parse path correctly"
+
+test_27x() { # bug 10997
+        mkdir -p $DIR/d27w || error "mkdir failed"
+        $LSTRIPE $DIR/d27w/f0 -s 65536 || error "lstripe failed"
+        size=`$LSTRIPEINFO $DIR/d27w/f0 | awk {'print $1'}`
+        [ $size -ne 65536 ] && error "stripe size $size != 65536" || true
+
+        [ "$OSTCOUNT" -lt "2" ] && skip "skipping multiple stripe count/offset test" && return
+        for i in `seq 1 $OSTCOUNT`; do
+                offset=$(($i-1))
+                $LSTRIPE $DIR/d27w/f$i -c $i -i $offset || error "lstripe -c $i -i $offset failed"
+                count=`$LSTRIPEINFO $DIR/d27w/f$i | awk {'print $2'}`
+                index=`$LSTRIPEINFO $DIR/d27w/f$i | awk {'print $3'}`
+                [ $count -ne $i ] && error "stripe count $count != $i" || true
+                [ $index -ne $offset ] && error "stripe offset $index != $offset" || true
+        done
+}
+run_test 27x "check lfs setstripe -c -s -i options ============="
+
 test_28() {
 	mkdir $DIR/d28
 	$CREATETEST $DIR/d28/ct || error
 }
 run_test 28 "create/mknod/mkdir with bad file types ============"
 
-cancel_lru_locks() {
-	for d in /proc/fs/lustre/ldlm/namespaces/$1*; do
-		echo clear > $d/lru_size
-	done
-	grep [0-9] /proc/fs/lustre/ldlm/namespaces/$1*/lock_unused_count /dev/null
-}
-
 test_29() {
-	cancel_lru_locks MDC
+	cancel_lru_locks mdc
 	mkdir $DIR/d29
 	touch $DIR/d29/foo
 	log 'first d29'
 	ls -l $DIR/d29
-	MDCDIR=${MDCDIR:-/proc/fs/lustre/ldlm/namespaces/MDC_*}
+	MDCDIR=${MDCDIR:-$LPROC/ldlm/namespaces/*-mdc-*}
 	LOCKCOUNTORIG=`cat $MDCDIR/lock_count`
 	LOCKUNUSEDCOUNTORIG=`cat $MDCDIR/lock_unused_count`
+	[ -z $"LOCKCOUNTORIG" ] && echo "No mdc lock count" && return 1
 	log 'second d29'
 	ls -l $DIR/d29
 	log 'done'
 	LOCKCOUNTCURRENT=`cat $MDCDIR/lock_count`
 	LOCKUNUSEDCOUNTCURRENT=`cat $MDCDIR/lock_unused_count`
-	if [ $LOCKCOUNTCURRENT -gt $LOCKCOUNTORIG ]; then
-		echo "CURRENT: $LOCKCOUNTCURRENT > $LOCKCOUNTORIG"
-		error
+	if [ "$LOCKCOUNTCURRENT" -gt "$LOCKCOUNTORIG" ]; then
+		echo > $LPROC/ldlm/dump_namespaces
+		error "CURRENT: $LOCKCOUNTCURRENT > $LOCKCOUNTORIG"
+		$LCTL dk | sort -k4 -t: > $TMP/test_29.dk
+		log "dumped log to $TMP/test_29.dk (bug 5793)"
+		return 2
 	fi
-	if [ $LOCKUNUSEDCOUNTCURRENT -gt $LOCKUNUSEDCOUNTORIG ]; then
-		echo "UNUSED: $LOCKUNUSEDCOUNTCURRENT > $LOCKUNUSEDCOUNTORIG"
-		error
+	if [ "$LOCKUNUSEDCOUNTCURRENT" -gt "$LOCKUNUSEDCOUNTORIG" ]; then
+		error "UNUSED: $LOCKUNUSEDCOUNTCURRENT > $LOCKUNUSEDCOUNTORIG"
+		$LCTL dk | sort -k4 -t: > $TMP/test_29.dk
+		log "dumped log to $TMP/test_29.dk (bug 5793)"
+		return 3
 	fi
 }
 run_test 29 "IT_GETATTR regression  ============================"
 
 test_30() {
-	cp `which ls` $DIR
+	cp `which ls` $DIR || cp /bin/ls $DIR
 	$DIR/ls /
 	rm $DIR/ls
 }
@@ -807,7 +1247,7 @@ test_31c() {
 	multiop $DIR/f31c Ouc
 	usleep 500
 	kill -USR1 $MULTIPID
-	wait $MUTLIPID
+	wait $MULTIPID
 }
 run_test 31c "open-unlink file with multiple links ============="
 
@@ -817,13 +1257,134 @@ test_31d() {
 }
 run_test 31d "remove of open directory ========================="
 
+test_31e() { # bug 2904
+	check_kernel_version 34 || return 0
+	openfilleddirunlink $DIR/d31e || error
+}
+run_test 31e "remove of open non-empty directory ==============="
+
+test_31f() { # bug 4554
+	set -vx
+	mkdir $DIR/d31f
+	lfs setstripe $DIR/d31f 1048576 -1 1
+	cp /etc/hosts $DIR/d31f
+	ls -l $DIR/d31f
+	lfs getstripe $DIR/d31f/hosts
+	multiop $DIR/d31f D_c &
+	MULTIPID=$!
+
+	sleep 1
+
+	rm -rv $DIR/d31f || error "first of $DIR/d31f"
+	mkdir $DIR/d31f
+	lfs setstripe $DIR/d31f 1048576 -1 1
+	cp /etc/hosts $DIR/d31f
+	ls -l $DIR/d31f
+	lfs getstripe $DIR/d31f/hosts
+	multiop $DIR/d31f D_c &
+	MULTIPID2=$!
+
+	sleep 6
+
+	kill -USR1 $MULTIPID || error "first opendir $MULTIPID not running"
+	wait $MULTIPID || error "first opendir $MULTIPID failed"
+
+	sleep 6
+
+	kill -USR1 $MULTIPID2 || error "second opendir $MULTIPID not running"
+	wait $MULTIPID2 || error "second opendir $MULTIPID2 failed"
+	set +vx
+}
+run_test 31f "remove of open directory with open-unlink file ==="
+
+test_31g() {
+        echo "-- cross directory link --"
+        mkdir $DIR/d31g{a,b}
+        touch $DIR/d31ga/f
+        ln $DIR/d31ga/f $DIR/d31gb/g
+        $CHECKSTAT -t file $DIR/d31ga/f || error "source"
+        [ `stat -c%h $DIR/d31ga/f` == '2' ] || error "source nlink"
+        $CHECKSTAT -t file $DIR/d31gb/g || error "target"
+        [ `stat -c%h $DIR/d31gb/g` == '2' ] || error "target nlink"
+}
+run_test 31g "cross directory link==============="
+
+test_31h() {
+        echo "-- cross directory link --"
+        mkdir $DIR/d31h
+        mkdir $DIR/d31h/dir
+        touch $DIR/d31h/f
+        ln $DIR/d31h/f $DIR/d31h/dir/g
+        $CHECKSTAT -t file $DIR/d31h/f || error "source"
+        [ `stat -c%h $DIR/d31h/f` == '2' ] || error "source nlink"
+        $CHECKSTAT -t file $DIR/d31h/dir/g || error "target"
+        [ `stat -c%h $DIR/d31h/dir/g` == '2' ] || error "target nlink"
+}
+run_test 31h "cross directory link under child==============="
+
+test_31i() {
+        echo "-- cross directory link --"
+        mkdir $DIR/d31i
+        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"
+        [ `stat -c%h $DIR/d31i/dir/f` == '2' ] || error "source nlink"
+        $CHECKSTAT -t file $DIR/d31i/g || error "target"
+        [ `stat -c%h $DIR/d31i/g` == '2' ] || error "target nlink"
+}
+run_test 31i "cross directory link under parent==============="
+
+
+test_31j() {
+        mkdir $DIR/d31j
+        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"
+        mlink $DIR/d31j/dir1 $DIR/d31j/dir1 && error "mlink to the same dir"
+	return 0
+}
+run_test 31j "link for directory==============="
+
+
+test_31k() {
+        mkdir $DIR/d31k
+        touch $DIR/d31k/s
+        touch $DIR/d31k/exist
+        mlink $DIR/d31k/s $DIR/d31k/t || error "mlink"
+        mlink $DIR/d31k/s $DIR/d31k/exist && error "mlink to exist file"
+        mlink $DIR/d31k/s $DIR/d31k/s && error "mlink to the same file"
+        mlink $DIR/d31k/s $DIR/d31k && error "mlink to parent dir"
+        mlink $DIR/d31k $DIR/d31k/s && error "mlink parent dir to target"
+        mlink $DIR/d31k/not-exist $DIR/d31k/foo && error "mlink non-existing to new"
+        mlink $DIR/d31k/not-exist $DIR/d31k/s && error "mlink non-existing to exist"
+	return 0
+}
+run_test 31k "link to file: the same, non-existing, dir==============="
+
+test_31m() {
+        mkdir $DIR/d31m
+        touch $DIR/d31m/s
+        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"
+        mlink $DIR/d31m/s $DIR/d31m2 && error "mlink to parent dir"
+        mlink $DIR/d31m2 $DIR/d31m/s && error "mlink parent dir to target"
+        mlink $DIR/d31m/not-exist $DIR/d31m2/foo && error "mlink non-existing to new"
+        mlink $DIR/d31m/not-exist $DIR/d31m2/s && error "mlink non-existing to exist"
+	return 0
+}
+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 
 	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
+	$UMOUNT $DIR/d32a/ext2-mountpoint || error
 }
 run_test 32a "stat d32a/ext2-mountpoint/.. ====================="
 
@@ -832,7 +1393,7 @@ test_32b() {
 	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
+	$UMOUNT $DIR/d32b/ext2-mountpoint || error
 }
 run_test 32b "open d32b/ext2-mountpoint/.. ====================="
  
@@ -842,7 +1403,7 @@ test_32c() {
 	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
+	$UMOUNT $DIR/d32c/ext2-mountpoint || error
 }
 run_test 32c "stat d32c/ext2-mountpoint/../d2/test_dir ========="
 
@@ -852,7 +1413,7 @@ test_32d() {
 	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
+	$UMOUNT $DIR/d32d/ext2-mountpoint || error
 }
 run_test 32d "open d32d/ext2-mountpoint/../d2/test_dir ========="
 
@@ -879,32 +1440,27 @@ test_32f() {
 run_test 32f "open d32f/symlink->tmp/symlink->lustre-subdir ===="
 
 test_32g() {
-	[ -e $DIR/d32g ] && rm -fr $DIR/d32g
-	[ -e $DIR/test_dir ] && rm -fr $DIR/test_dir
-	mkdir -p $DIR/test_dir 
-	mkdir -p $DIR/d32g/tmp    
-	TMP_DIR=$DIR/d32g/tmp       
-	ln -s $DIR/test_dir $TMP_DIR/symlink12 
+	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 
-	$CHECKSTAT -t link $DIR/d32g/tmp/symlink12 || error
-	$CHECKSTAT -t link $DIR/d32g/symlink02 || error
-	$CHECKSTAT -t dir -f $DIR/d32g/tmp/symlink12 || error
-	$CHECKSTAT -t dir -f $DIR/d32g/symlink02 || error
+	$CHECKSTAT -t link $TMP_DIR/symlink12 || error
+	$CHECKSTAT -t link $DIR/$tdir/symlink02 || error
+	$CHECKSTAT -t dir -f $TMP_DIR/symlink12 || error
+	$CHECKSTAT -t dir -f $DIR/$tdir/symlink02 || error
 }
-run_test 32g "stat d32g/symlink->tmp/symlink->lustre-subdir/test_dir"
+run_test 32g "stat d32g/symlink->tmp/symlink->lustre-subdir/${tdir}2"
 
 test_32h() {
-	[ -e $DIR/d32h ] && rm -fr $DIR/d32h
-	[ -e $DIR/test_dir ] && rm -fr $DIR/test_dir
-	mkdir -p $DIR/test_dir 
-	mkdir -p $DIR/d32h/tmp    
-	TMP_DIR=$DIR/d32h/tmp       
-	ln -s $DIR/test_dir $TMP_DIR/symlink12 
+	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 
-	ls $DIR/d32h/tmp/symlink12 || error
-	ls $DIR/d32h/symlink02  || error
+	ls $TMP_DIR/symlink12 || error
+	ls $DIR/$tdir/symlink02  || error
 }
-run_test 32h "open d32h/symlink->tmp/symlink->lustre-subdir/test_dir"
+run_test 32h "open d32h/symlink->tmp/symlink->lustre-subdir/${tdir}2"
 
 test_32i() {
 	[ -e $DIR/d32i ] && rm -fr $DIR/d32i
@@ -912,7 +1468,7 @@ test_32i() {
 	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
+	$UMOUNT $DIR/d32i/ext2-mountpoint || error
 }
 run_test 32i "stat d32i/ext2-mountpoint/../test_file ==========="
 
@@ -922,7 +1478,7 @@ test_32j() {
 	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
+	$UMOUNT $DIR/d32j/ext2-mountpoint || error
 }
 run_test 32j "open d32j/ext2-mountpoint/../test_file ==========="
 
@@ -933,7 +1489,7 @@ test_32k() {
 	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
+	$UMOUNT $DIR/d32k/ext2-mountpoint || error
 }
 run_test 32k "stat d32k/ext2-mountpoint/../d2/test_file ========"
 
@@ -944,7 +1500,7 @@ test_32l() {
 	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
+	$UMOUNT $DIR/d32l/ext2-mountpoint || error
 }
 run_test 32l "open d32l/ext2-mountpoint/../d2/test_file ========"
 
@@ -971,33 +1527,32 @@ test_32n() {
 run_test 32n "open d32n/symlink->tmp/symlink->lustre-root ======"
 
 test_32o() {
-	rm -fr $DIR/d32o
-	rm -f $DIR/test_file
-	touch $DIR/test_file 
+	rm -fr $DIR/d32o $DIR/$tfile
+	touch $DIR/$tfile 
 	mkdir -p $DIR/d32o/tmp    
 	TMP_DIR=$DIR/d32o/tmp       
-	ln -s $DIR/test_file $TMP_DIR/symlink12 
+	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
 	$CHECKSTAT -t file -f $DIR/d32o/symlink02 || error
 }
-run_test 32o "stat d32o/symlink->tmp/symlink->lustre-root/test_file"
+run_test 32o "stat d32o/symlink->tmp/symlink->lustre-root/$tfile"
 
 test_32p() {
     log 32p_1
 	rm -fr $DIR/d32p
     log 32p_2
-	rm -f $DIR/test_file
+	rm -f $DIR/$tfile
     log 32p_3
-	touch $DIR/test_file 
+	touch $DIR/$tfile 
     log 32p_4
 	mkdir -p $DIR/d32p/tmp    
     log 32p_5
 	TMP_DIR=$DIR/d32p/tmp       
     log 32p_6
-	ln -s $DIR/test_file $TMP_DIR/symlink12 
+	ln -s $DIR/$tfile $TMP_DIR/symlink12 
     log 32p_7
 	ln -s $TMP_DIR/symlink12 $TMP_DIR/../symlink02 
     log 32p_8
@@ -1006,160 +1561,226 @@ test_32p() {
 	cat $DIR/d32p/symlink02 || error
     log 32p_10
 }
-run_test 32p "open d32p/symlink->tmp/symlink->lustre-root/test_file"
+run_test 32p "open d32p/symlink->tmp/symlink->lustre-root/$tfile"
 
 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
+	ls $DIR/d32q/under_the_mount && error || true
+	$UMOUNT $DIR/d32q || error
 }
-run_test 32q "stat follows mountpoints in Lustre ========================="
+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
+	ls $DIR/d32r | grep -q under_the_mount && error || true
+	$UMOUNT $DIR/d32r || error
 }
-run_test 32r "opendir follows mountpoints in Lustre ========================="
+run_test 32r "opendir follows mountpoints in Lustre (should return error)"
 
-#   chmod 444 /mnt/lustre/somefile
-#   open(/mnt/lustre/somefile, O_RDWR)
-#   Should return -1
 test_33() {
-	rm -f $DIR/test_33_file
-	touch $DIR/test_33_file
-	chmod 444 $DIR/test_33_file
-	chown $RUNAS_ID $DIR/test_33_file
-        log 33_1
-        $RUNAS $OPENFILE -f O_RDWR $DIR/test_33_file && error || true
-        log 33_2
+	rm -f $DIR/$tfile
+	touch $DIR/$tfile
+	chmod 444 $DIR/$tfile
+	chown $RUNAS_ID $DIR/$tfile
+	log 33_1
+	$RUNAS $OPENFILE -f O_RDWR $DIR/$tfile && error || true
+	log 33_2
 }
 run_test 33 "write file with mode 444 (should return error) ===="
 
+test_33a() {
+        rm -fr $DIR/d33
+        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 && \
+		error "open RDWR" || true
+}
+run_test 33a "test open file(mode=0444) with O_RDWR (should return error)"
+
 TEST_34_SIZE=${TEST_34_SIZE:-2000000000000}
 test_34a() {
-	rm -f $DIR/test_34_file
-	$MCREATE $DIR/test_34_file || error
-	$LFIND $DIR/test_34_file 2>&1 | grep -q "no stripe info" || error
-	$TRUNCATE $DIR/test_34_file $TEST_34_SIZE || error
-	$LFIND $DIR/test_34_file 2>&1 | grep -q "no stripe info" || error
-	$CHECKSTAT -s $TEST_34_SIZE $DIR/test_34_file || error
+	rm -f $DIR/f34
+	$MCREATE $DIR/f34 || error
+	$GETSTRIPE $DIR/f34 2>&1 | grep -q "no stripe info" || error
+	$TRUNCATE $DIR/f34 $TEST_34_SIZE || error
+	$GETSTRIPE $DIR/f34 2>&1 | grep -q "no stripe info" || error
+	$CHECKSTAT -s $TEST_34_SIZE $DIR/f34 || error
 }
 run_test 34a "truncate file that has not been opened ==========="
 
 test_34b() {
-	[ ! -f $DIR/test_34_file ] && run_one 34a
-	$CHECKSTAT -s $TEST_34_SIZE $DIR/test_34_file || error
-	$OPENFILE -f O_RDONLY $DIR/test_34_file
-	$LFIND $DIR/test_34_file 2>&1 | grep -q "no stripe info" || error
-	$CHECKSTAT -s $TEST_34_SIZE $DIR/test_34_file || error
+	[ ! -f $DIR/f34 ] && test_34a
+	$CHECKSTAT -s $TEST_34_SIZE $DIR/f34 || error
+	$OPENFILE -f O_RDONLY $DIR/f34
+	$GETSTRIPE $DIR/f34 2>&1 | grep -q "no stripe info" || error
+	$CHECKSTAT -s $TEST_34_SIZE $DIR/f34 || error
 }
 run_test 34b "O_RDONLY opening file doesn't create objects ====="
 
 test_34c() {
-	[ ! -f $DIR/test_34_file ] && run_one 34a 
-	$CHECKSTAT -s $TEST_34_SIZE $DIR/test_34_file || error
-	$OPENFILE -f O_RDWR $DIR/test_34_file
-	$LFIND $DIR/test_34_file 2>&1 | grep -q "no stripe info" && error
-	$CHECKSTAT -s $TEST_34_SIZE $DIR/test_34_file || error
+	[ ! -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
+	$CHECKSTAT -s $TEST_34_SIZE $DIR/f34 || error
 }
 run_test 34c "O_RDWR opening file-with-size works =============="
 
 test_34d() {
-	dd if=/dev/zero of=$DIR/test_34_file conv=notrunc bs=4k count=1 || error
-	$CHECKSTAT -s $TEST_34_SIZE $DIR/test_34_file || error
-	rm $DIR/test_34_file
+	[ ! -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
 }
 run_test 34d "write to sparse file ============================="
 
 test_34e() {
-	rm -f $DIR/test_34_file
-	$MCREATE $DIR/test_34_file || error
-	$TRUNCATE $DIR/test_34_file 1000 || error
-	$CHECKSTAT -s 1000 $DIR/test_34_file || error
-	$OPENFILE -f O_RDWR $DIR/test_34_file
-	$CHECKSTAT -s 1000 $DIR/test_34_file || error
+	rm -f $DIR/f34e
+	$MCREATE $DIR/f34e || error
+	$TRUNCATE $DIR/f34e 1000 || error
+	$CHECKSTAT -s 1000 $DIR/f34e || error
+	$OPENFILE -f O_RDWR $DIR/f34e
+	$CHECKSTAT -s 1000 $DIR/f34e || error
 }
 run_test 34e "create objects, some with size and some without =="
 
+test_34f() { # bug 6242, 6243
+	SIZE34F=48000
+	rm -f $DIR/f34f
+	$MCREATE $DIR/f34f || error
+	$TRUNCATE $DIR/f34f $SIZE34F || error "truncating $DIR/f3f to $SIZE34F"
+	dd if=$DIR/f34f of=$TMP/f34f
+	$CHECKSTAT -s $SIZE34F $TMP/f34f || error "$TMP/f34f not $SIZE34F bytes"
+	dd if=/dev/zero of=$TMP/f34fzero bs=$SIZE34F count=1
+	cmp $DIR/f34f $TMP/f34fzero || error "$DIR/f34f not all zero"
+	cmp $TMP/f34f $TMP/f34fzero || error "$TMP/f34f not all zero"
+	rm $TMP/f34f $TMP/f34fzero $DIR/f34f
+}
+run_test 34f "read from a file with no objects until EOF ======="
+
 test_35a() {
-	cp /bin/sh $DIR/test_35a_file
-	chmod 444 $DIR/test_35a_file
-	chown $RUNAS_ID $DIR/test_35a_file
-	$RUNAS $DIR/test_35a_file && error || true
-	rm $DIR/test_35a_file
+	cp /bin/sh $DIR/f35a
+	chmod 444 $DIR/f35a
+	chown $RUNAS_ID $DIR/f35a
+	$RUNAS $DIR/f35a && error || true
+	rm $DIR/f35a
 }
 run_test 35a "exec file with mode 444 (should return and not leak) ====="
 
-
 test_36a() {
-	rm -f $DIR/test_36_file
-	utime $DIR/test_36_file || error
+	rm -f $DIR/f36
+	utime $DIR/f36 || error
 }
 run_test 36a "MDS utime check (mknod, utime) ==================="
 
 test_36b() {
-	echo "" > $DIR/test_36_file
-	utime $DIR/test_36_file || error
+	echo "" > $DIR/f36
+	utime $DIR/f36 || error
 }
 run_test 36b "OST utime check (open, utime) ===================="
 
 test_36c() {
-	rm -f $DIR/d36/test_36_file
+	rm -f $DIR/d36/f36
 	mkdir $DIR/d36
 	chown $RUNAS_ID $DIR/d36
-	$RUNAS utime $DIR/d36/test_36_file || error
+	$RUNAS utime $DIR/d36/f36 || error
 }
 run_test 36c "non-root MDS utime check (mknod, utime) =========="
 
 test_36d() {
-	[ ! -d $DIR/d36 ] && run_one 36c
-	echo "" > $DIR/d36/test_36_file
-	$RUNAS utime $DIR/d36/test_36_file || error
+	[ ! -d $DIR/d36 ] && test_36c
+	echo "" > $DIR/d36/f36
+	$RUNAS utime $DIR/d36/f36 || error
 }
 run_test 36d "non-root OST utime check (open, utime) ==========="
 
 test_36e() {
-	[ $RUNAS_ID -eq $UID ] && return
-	[ ! -d $DIR/d36 ] && mkdir $DIR/d36
-	touch $DIR/d36/test_36_file2
-	$RUNAS utime $DIR/d36/test_36_file2 && error || true
+	[ $RUNAS_ID -eq $UID ] && skip "RUNAS_ID = UID = $UID -- skipping" && return
+	mkdir -p $DIR/$tdir
+	touch $DIR/$tdir/$tfile
+	$RUNAS utime $DIR/$tdir/$tfile && \
+		error "utime worked, expected failure" || true
 }
 run_test 36e "utime on non-owned file (should return error) ===="
 
+test_36f() {
+	export LANG=C LC_LANG=C # for date language
+
+	DATESTR="Dec 20  2000"
+	mkdir -p $DIR/$tdir
+	#define OBD_FAIL_OST_BRW_PAUSE_BULK 0x214
+        sysctl -w lustre.fail_loc=0x80000214
+	date; date +%s
+	cp /etc/hosts $DIR/$tdir/$tfile
+	sync & # write RPC generated with "current" inode timestamp, but delayed
+	sleep 1
+	touch --date="$DATESTR" $DIR/$tdir/$tfile # setattr timestamp in past
+	LS_BEFORE="`ls -l $DIR/$tdir/$tfile`" # old timestamp from client cache
+	cancel_lru_locks osc
+	LS_AFTER="`ls -l $DIR/$tdir/$tfile`"  # timestamp from OST object
+	date; date +%s
+	[ "$LS_BEFORE" != "$LS_AFTER" ] && \
+		echo "BEFORE: $LS_BEFORE" && \
+		echo "AFTER : $LS_AFTER" && \
+		echo "WANT  : $DATESTR" && \
+		error "$DIR/$tdir/$tfile timestamps changed" || true
+}
+run_test 36f "utime on file racing with OST BRW write =========="
+
+if [ -d $LPROC/obdfilter ]; then
+export FMD_MAX_AGE=`cat $LPROC/obdfilter/*/client_cache_seconds | head -n 1`
+fi
+test_36g() {
+	[ -z "$FMD_MAX_AGE" ] && skip "skip test for remote OST" && return
+	FMD_BEFORE="`awk '/ll_fmd_cache/ { print $2 }' /proc/slabinfo`"
+	touch $DIR/d36/$tfile
+	sleep $((FMD_MAX_AGE + 12))
+	FMD_AFTER="`awk '/ll_fmd_cache/ { print $2 }' /proc/slabinfo`"
+	[ "$FMD_AFTER" -gt "$FMD_BEFORE" ] && \
+		echo "AFTER : $FMD_AFTER > BEFORE $FMD_BEFORE" && \
+		error "fmd didn't expire after ping" || true
+}
+run_test 36g "filter mod data cache expiry ====================="
+
 test_37() {
-	mkdir -p $DIR/dextra
-	echo f > $DIR/dextra/fbugfile
-	mount -t ext2 -o loop $EXT2_DEV $DIR/dextra
-	ls $DIR/dextra | grep "\<fbugfile\>" && error
-	umount $DIR/dextra || error
-	rm -f $DIR/dextra/fbugfile || error
+	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_38() {
-	o_directory $DIR/test38
+	o_directory $DIR/$tfile
 }
 run_test 38 "open a regular file with O_DIRECTORY =============="
 
 test_39() {
-	touch $DIR/test_39_file
-	touch $DIR/test_39_file2
-#	ls -l  $DIR/test_39_file $DIR/test_39_file2
-#	ls -lu  $DIR/test_39_file $DIR/test_39_file2
-#	ls -lc  $DIR/test_39_file $DIR/test_39_file2
+	touch $DIR/$tfile
+	touch $DIR/${tfile}2
+#	ls -l  $DIR/$tfile $DIR/${tfile}2
+#	ls -lu  $DIR/$tfile $DIR/${tfile}2
+#	ls -lc  $DIR/$tfile $DIR/${tfile}2
 	sleep 2
-	$OPENFILE -f O_CREAT:O_TRUNC:O_WRONLY $DIR/test_39_file2
-#	ls -l  $DIR/test_39_file $DIR/test_39_file2
-#	ls -lu  $DIR/test_39_file $DIR/test_39_file2
-#	ls -lc  $DIR/test_39_file $DIR/test_39_file2
-	[ $DIR/test_39_file2 -nt $DIR/test_39_file ] || error
+	$OPENFILE -f O_CREAT:O_TRUNC:O_WRONLY $DIR/${tfile}2
+	if [ ! $DIR/${tfile}2 -nt $DIR/$tfile ]; then
+		echo "mtime"
+		ls -l  $DIR/$tfile $DIR/${tfile}2
+		echo "atime"
+		ls -lu  $DIR/$tfile $DIR/${tfile}2
+		echo "ctime"
+		ls -lc  $DIR/$tfile $DIR/${tfile}2
+		error "O_TRUNC didn't change timestamps"
+	fi
 }
 run_test 39 "mtime changed on create ==========================="
 
@@ -1177,51 +1798,99 @@ test_41() {
 run_test 41 "test small file write + fstat ====================="
 
 count_ost_writes() {
-        cat /proc/fs/lustre/osc/*/stats |
+        cat $LPROC/osc/*/stats |
             awk -vwrites=0 '/ost_write/ { writes += $2 } END { print writes; }'
 }
-start_kupdated() {
-	# in 2.6, restore /proc/sys/vm/dirty_writeback_centisecs
-	kill -CONT `pidof kupdated`
+
+# decent default
+WRITEBACK_SAVE=500
+DIRTY_RATIO_SAVE=40
+MAX_DIRTY_RATIO=50
+BG_DIRTY_RATIO_SAVE=10
+MAX_BG_DIRTY_RATIO=25
+
+start_writeback() {
+	trap 0
+	# in 2.6, restore /proc/sys/vm/dirty_writeback_centisecs,
+	# dirty_ratio, dirty_background_ratio
+	if [ -f /proc/sys/vm/dirty_writeback_centisecs ]; then
+		echo $WRITEBACK_SAVE > /proc/sys/vm/dirty_writeback_centisecs
+		echo $BG_DIRTY_RATIO_SAVE > /proc/sys/vm/dirty_background_ratio
+		echo $DIRTY_RATIO_SAVE > /proc/sys/vm/dirty_ratio
+	else
+		# if file not here, we are a 2.4 kernel
+		kill -CONT `pidof kupdated`
+	fi
 }
-stop_kupdated() {
+
+stop_writeback() {
+	# setup the trap first, so someone cannot exit the test at the
+	# exact wrong time and mess up a machine
+	trap start_writeback EXIT
 	# in 2.6, save and 0 /proc/sys/vm/dirty_writeback_centisecs
-	kill -STOP `pidof kupdated`
-	trap start_kupdated EXIT
+	if [ -f /proc/sys/vm/dirty_writeback_centisecs ]; then
+		WRITEBACK_SAVE=`cat /proc/sys/vm/dirty_writeback_centisecs`
+		echo 0 > /proc/sys/vm/dirty_writeback_centisecs
+		echo 0 > /proc/sys/vm/dirty_writeback_centisecs
+		# save and increase /proc/sys/vm/dirty_ratio
+		DIRTY_RATIO_SAVE=`cat /proc/sys/vm/dirty_ratio`
+		echo $MAX_DIRTY_RATIO > /proc/sys/vm/dirty_ratio
+		# save and increase /proc/sys/vm/dirty_background_ratio
+		BG_DIRTY_RATIO_SAVE=`cat /proc/sys/vm/dirty_background_ratio`
+		echo $MAX_BG_DIRTY_RATIO > /proc/sys/vm/dirty_background_ratio
+	else
+		# if file not here, we are a 2.4 kernel
+		kill -STOP `pidof kupdated`
+	fi
+}
+
+# ensure that all stripes have some grant before we test client-side cache
+setup_test42() {
+	[ "$SETUP_TEST42" ] && return
+	for i in `seq -f $DIR/f42-%g 1 $OSTCOUNT`; do
+		dd if=/dev/zero of=$i bs=4k count=1
+		rm $i
+	done
+	SETUP_TEST42=DONE
 }
 
 # Tests 42* verify that our behaviour is correct WRT caching, file closure,
 # file truncation, and file removal.
 test_42a() {
-	cancel_lru_locks OSC
-	stop_kupdated
-        sync # just to be safe
-        BEFOREWRITES=`count_ost_writes`
+	setup_test42
+	cancel_lru_locks osc
+	stop_writeback
+	sync; sleep 1; sync # just to be safe
+	BEFOREWRITES=`count_ost_writes`
+        grep "[0-9]" $LPROC/osc/*[oO][sS][cC][_-]*/cur_grant_bytes
         dd if=/dev/zero of=$DIR/f42a bs=1024 count=100
-        AFTERWRITES=`count_ost_writes`
-        [ $BEFOREWRITES -eq $AFTERWRITES ] || \
+	AFTERWRITES=`count_ost_writes`
+	[ $BEFOREWRITES -eq $AFTERWRITES ] || \
 		error "$BEFOREWRITES < $AFTERWRITES"
-	start_kupdated
+	start_writeback
 }
 run_test 42a "ensure that we don't flush on close =============="
 
 test_42b() {
-	cancel_lru_locks OSC
-	stop_kupdated
+	setup_test42
+	cancel_lru_locks osc
+	stop_writeback
         sync
         dd if=/dev/zero of=$DIR/f42b bs=1024 count=100
         BEFOREWRITES=`count_ost_writes`
         $MUNLINK $DIR/f42b || error "$MUNLINK $DIR/f42b: $?"
         AFTERWRITES=`count_ost_writes`
-        [ $BEFOREWRITES -eq $AFTERWRITES ] ||
-            error "$BEFOREWRITES < $AFTERWRITES on unlink"
+        if [ $BEFOREWRITES -lt $AFTERWRITES ]; then
+                error "$BEFOREWRITES < $AFTERWRITES on unlink"
+        fi
         BEFOREWRITES=`count_ost_writes`
         sync || error "sync: $?"
         AFTERWRITES=`count_ost_writes`
-        [ $BEFOREWRITES -eq $AFTERWRITES ] ||
-            error "$BEFOREWRITES < $AFTERWRITES on sync"
+        if [ $BEFOREWRITES -lt $AFTERWRITES ]; then
+                error "$BEFOREWRITES < $AFTERWRITES on sync"
+        fi
         dmesg | grep 'error from obd_brw_async' && error 'error writing back'
-	start_kupdated
+	start_writeback
         return 0
 }
 run_test 42b "test destroy of file with cached dirty data ======"
@@ -1236,15 +1905,15 @@ run_test 42b "test destroy of file with cached dirty data ======"
 # any number of fixes (don't get {0,EOF} on open, match
 # composite locks, do smarter file size management) fix
 # this, but for now we want these tests to verify that
-# the cancelation with truncate intent works, so we
+# the cancellation with truncate intent works, so we
 # start the file with a full-file pw lock to match against
 # until the truncate.
 trunc_test() {
         test=$1
         file=$DIR/$test
         offset=$2
-	cancel_lru_locks OSC
-	stop_kupdated
+	cancel_lru_locks osc
+	stop_writeback
 	# prime the file with 0,EOF PW to match
 	touch $file
         $TRUNCATE $file 0
@@ -1253,18 +1922,18 @@ trunc_test() {
         dd if=/dev/zero of=$file bs=1024 count=100
         BEFOREWRITES=`count_ost_writes`
         $TRUNCATE $file $offset
-        cancel_lru_locks OSC
+        cancel_lru_locks osc
         AFTERWRITES=`count_ost_writes`
-	start_kupdated
+	start_writeback
 }
 
 test_42c() {
         trunc_test 42c 1024
         [ $BEFOREWRITES -eq $AFTERWRITES ] && \
-            error "$BEFOREWRITES < $AFTERWRITES on truncate"
+            error "beforewrites $BEFOREWRITES == afterwrites $AFTERWRITES on truncate"
         rm $file
 }
-run_test 42c "test partial truncate of file with cached dirty data ===="
+run_test 42c "test partial truncate of file with cached dirty data"
 
 test_42d() {
         trunc_test 42d 0
@@ -1272,55 +1941,55 @@ test_42d() {
             error "beforewrites $BEFOREWRITES != afterwrites $AFTERWRITES on truncate"
         rm $file
 }
-run_test 42d "test complete truncate of file with cached dirty data ===="
+run_test 42d "test complete truncate of file with cached dirty data"
 
 test_43() {
-	mkdir $DIR/d43
-	cp -p /bin/ls $DIR/d43/f
-	exec 100>> $DIR/d43/f	
-	$DIR/d43/f && error || true
-	exec 100<&-
+	mkdir $DIR/$tdir
+	cp -p /bin/ls $DIR/$tdir/$tfile
+	exec 9>> $DIR/$tdir/$tfile
+	$DIR/$tdir/$tfile && error || true
+	exec 9<&-
 }
-run_test 43 "execution of file opened for write should return -ETXTBSY=="
+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
-        touch $DIR/d43/g
-        $DIR/d43/multiop $DIR/d43/g o_c &
+	cp -p `which multiop` $DIR/d43/multiop || cp -p multiop $DIR/d43/multiop
+        $DIR/d43/multiop $TMP/test43.junk O_c &
         MULTIPID=$!
         sleep 1
         multiop $DIR/d43/multiop Oc && error "expected error, got success"
         kill -USR1 $MULTIPID || return 2
         wait $MULTIPID || return 3
+        rm $TMP/test43.junk
 }
-run_test 43a "open(RDWR) of file being executed should return -ETXTBSY=="
+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
-        touch $DIR/d43/g
-        $DIR/d43/multiop $DIR/d43/g o_c &
+	cp -p `which multiop` $DIR/d43/multiop || cp -p multiop $DIR/d43/multiop
+        $DIR/d43/multiop $TMP/test43.junk O_c &
         MULTIPID=$!
         sleep 1
         truncate $DIR/d43/multiop 0 && error "expected error, got success"
         kill -USR1 $MULTIPID || return 2
         wait $MULTIPID || return 3
+        rm $TMP/test43.junk
 }
-run_test 43b "truncate of file being executed should return -ETXTBSY===="
+run_test 43b "truncate of file being executed should return -ETXTBSY"
 
 test_43c() {
-	local testdir="$DIR/43a"
+	local testdir="$DIR/d43c"
 	mkdir -p $testdir
 	cp $SHELL $testdir/
-	( cd $(dirname $SHELL) && md5sum $(basename $SHELL) ) |  \
+	( cd $(dirname $SHELL) && md5sum $(basename $SHELL) ) | \
 		( cd $testdir && md5sum -c)
 }
-run_test 43c "md5sum of copy into lustre================================"
+run_test 43c "md5sum of copy into lustre========================"
 
 test_44() {
-	[  "$STRIPECOUNT" -lt "2" ] && echo "skipping 2-stripe test" && return
-	dd if=/dev/zero of=$DIR/f1 bs=4k count=1 seek=127
+	[  "$OSTCOUNT" -lt "2" ] && skip "skipping 2-stripe test" && return
+	dd if=/dev/zero of=$DIR/f1 bs=4k count=1 seek=1023
 	dd if=$DIR/f1 bs=4k count=1
 }
 run_test 44 "zero length read from a sparse stripe ============="
@@ -1328,30 +1997,34 @@ run_test 44 "zero length read from a sparse stripe ============="
 test_44a() {
     local nstripe=`$LCTL lov_getconfig $DIR | grep default_stripe_count: | \
                          awk '{print $2}'`
+    [ -z "$nstripe" ] && skip "can't get stripe info" && return
+    [ "$nstripe" -gt "$OSTCOUNT" ] && skip "Wrong default_stripe_count: $nstripe (OSTCOUNT: $OSTCOUNT)" && return
     local stride=`$LCTL lov_getconfig $DIR | grep default_stripe_size: | \
                       awk '{print $2}'`
-    if [ $nstripe -eq 0 ] ; then
+    if [ $nstripe -eq 0 -o $nstripe -gt 1024 ] ; then
         nstripe=`$LCTL lov_getconfig $DIR | grep obd_count: | awk '{print $2}'`
     fi
 
     OFFSETS="0 $((stride/2)) $((stride-1))"
     for offset in $OFFSETS ; do
       for i in `seq 0 $((nstripe-1))`; do
-        rm -f $DIR/44a
         local GLOBALOFFSETS=""
         local size=$((((i + 2 * $nstripe )*$stride + $offset)))  # Bytes
-        ll_sparseness_write $DIR/44a $size  || error "ll_sparseness_write"
+	local myfn=$DIR/d44a-$size
+	echo "--------writing $myfn at $size"
+        ll_sparseness_write $myfn $size  || error "ll_sparseness_write"
         GLOBALOFFSETS="$GLOBALOFFSETS $size"
-        ll_sparseness_verify $DIR/44a $GLOBALOFFSETS \
+        ll_sparseness_verify $myfn $GLOBALOFFSETS \
                             || error "ll_sparseness_verify $GLOBALOFFSETS"
 
         for j in `seq 0 $((nstripe-1))`; do
             size=$((((j + $nstripe )*$stride + $offset)))  # Bytes
-            ll_sparseness_write $DIR/44a $size || error "ll_sparseness_write"
+            ll_sparseness_write $myfn $size || error "ll_sparseness_write"
             GLOBALOFFSETS="$GLOBALOFFSETS $size"
         done
-        ll_sparseness_verify $DIR/44a $GLOBALOFFSETS \
+        ll_sparseness_verify $myfn $GLOBALOFFSETS \
                             || error "ll_sparseness_verify $GLOBALOFFSETS"
+	rm -f $myfn
       done
     done
 }
@@ -1359,7 +2032,7 @@ run_test 44a "test sparse pwrite ==============================="
 
 dirty_osc_total() {
 	tot=0
-	for d in /proc/fs/lustre/osc/*/cur_dirty_bytes; do
+	for d in $LPROC/osc/*/cur_dirty_bytes; do
 		tot=$(($tot + `cat $d`))
 	done
 	echo $tot
@@ -1372,8 +2045,10 @@ do_dirty_record() {
 	echo before $before, after $after
 }
 test_45() {
-	f="$DIR/45"
-	stop_kupdated
+	f="$DIR/f45"
+	# Obtain grants from OST if it supports it
+	echo blah > ${f}_grant
+	stop_writeback
 	sync
 	do_dirty_record "echo blah > $f"
 	[ $before -eq $after ] && error "write wasn't cached"
@@ -1385,9 +2060,9 @@ test_45() {
 	[ $before -gt $after ] || error "writeback didn't lower dirty count"
 	do_dirty_record "echo blah > $f"
 	[ $before -eq $after ] && error "write wasn't cached"
-	do_dirty_record "cancel_lru_locks OSC"
-	[ $before -gt $after ] || error "lock cancelation didn't lower dirty count"
-	start_kupdated
+	do_dirty_record "cancel_lru_locks osc"
+	[ $before -gt $after ] || error "lock cancellation didn't lower dirty count"
+	start_writeback
 }
 run_test 45 "osc io page accounting ============================"
 
@@ -1395,20 +2070,20 @@ page_size() {
 	getconf PAGE_SIZE
 }
 
-# in a 2 stripe file (lov.sh), page 63 maps to page 31 in its object.  this
+# 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 63's mapped 
-# offset 31 and 31's raw 31 offset. it also found general redirtying bugs.
+# 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/46"
-	stop_kupdated
+	f="$DIR/f46"
+	stop_writeback
 	sync
-	dd if=/dev/zero of=$f bs=`page_size` seek=31 count=1
+	dd if=/dev/zero of=$f bs=`page_size` seek=511 count=1
 	sync
-	dd conv=notrunc if=/dev/zero of=$f bs=`page_size` seek=63 count=1
-	dd conv=notrunc if=/dev/zero of=$f bs=`page_size` seek=31 count=1
+	dd conv=notrunc if=/dev/zero of=$f bs=`page_size` seek=1023 count=1
+	dd conv=notrunc if=/dev/zero of=$f bs=`page_size` seek=511 count=1
 	sync
-	start_kupdated
+	start_writeback
 }
 run_test 46 "dirtying a previously written page ================"
 
@@ -1418,14 +2093,113 @@ test_47() {
 }
 run_test 47 "Device nodes check ================================"
 
-test_48() {
-        mkdir $DIR/d48
-        cd $DIR/d48
-        mv $DIR/d48 $DIR/d48.new || error "move directory failed"
-        mkdir $DIR/d48 || error "recreate diectory failed"
-        ls || error "can't list after recreate directory"
+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"
+	touch foo || error "'touch foo' failed after recreating cwd"
+	mkdir 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"
+	fi
+	ls . || error "'ls .' failed after recreating cwd"
+	ls .. || error "'ls ..' failed after removing cwd"
+	cd . || error "'cd .' failed after recreating cwd"
+	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"
+}
+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"
+	touch foo && error "'touch foo' worked after removing cwd"
+	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"
+	fi
+	ls . && error "'ls .' worked after removing cwd"
+	ls .. || error "'ls ..' failed after removing cwd"
+	cd . && error "'cd .' worked after removing cwd"
+	mkdir . && 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
+}
+run_test 48b "Access removed working dir (should return errors)="
+
+test_48c() { # bug 2350
+	check_kernel_version 36 || return 0
+	#sysctl -w lnet.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"
+	if check_kernel_version 44; then
+		touch .foo && error "'touch .foo' worked after removing cwd"
+		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"
+	$TRACE cd . && error "'cd .' worked after removing cwd"
+	$TRACE 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
+}
+run_test 48c "Access removed working subdir (should return errors)"
+
+test_48d() { # bug 2350
+	check_kernel_version 36 || return 0
+	#sysctl -w lnet.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"
+	$TRACE touch foo && error "'touch foo' worked after removing parent"
+	$TRACE 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"
+	fi
+	$TRACE ls . && error "'ls .' worked after removing parent"
+	$TRACE ls .. && error "'ls ..' worked after removing parent"
+	$TRACE cd . && error "'cd .' worked after recreate parent"
+	$TRACE 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"
+	$TRACE cd .. && error "'cd ..' worked after removing parent" || true
+}
+run_test 48d "Access removed parent subdir (should return errors)"
+
+test_48e() { # bug 4134
+	check_kernel_version 41 || return 0
+	#sysctl -w lnet.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"
+	# 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"
 }
-run_test 48 "Access renamed current working directory ========="
+run_test 48e "Access to recreated parent subdir (should return errors)"
 
 test_50() {
 	# bug 1485
@@ -1437,38 +2211,92 @@ run_test 50 "special situations: /proc symlinks  ==============="
 
 test_51() {
 	# bug 1516 - create an empty entry right after ".." then split dir
-	mkdir $DIR/d49
-	touch $DIR/d49/foo
-	$MCREATE $DIR/d49/bar
-	rm $DIR/d49/foo
-	createmany -m $DIR/d49/longfile 201
+	mkdir $DIR/d51
+	touch $DIR/d51/foo
+	$MCREATE $DIR/d51/bar
+	rm $DIR/d51/foo
+	createmany -m $DIR/d51/longfile 201
 	FNUM=202
-	while [ `ls -sd $DIR/d49 | awk '{ print $1 }'` -eq 4 ]; do
-		$MCREATE $DIR/d49/longfile$FNUM
+	while [ `ls -sd $DIR/d51 | awk '{ print $1 }'` -eq 4 ]; do
+		$MCREATE $DIR/d51/longfile$FNUM
 		FNUM=$(($FNUM + 1))
 		echo -n "+"
 	done
-	ls -l $DIR/d49 > /dev/null || error
+	ls -l $DIR/d51 > /dev/null || error
 }
 run_test 51 "special situations: split htree with empty entry =="
 
+#export NUMTEST=70000
+# FIXME: I select a relatively small number to do basic test.
+# large number may give panic(). debugging on this is going on.
+export NUMTEST=70
+test_51b() {
+	NUMFREE=`df -i -P $DIR | tail -n 1 | awk '{ print $4 }'`
+	[ $NUMFREE -lt 21000 ] && \
+		skip "not enough free inodes ($NUMFREE)" && \
+		return
+
+	check_kernel_version 40 || NUMTEST=31000
+	[ $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_51c() {
+	[ ! -d $DIR/d51b ] && skip "$DIR/51b missing" && \
+		return
+
+	unlinkmany -d $DIR/d51b/t- $NUMTEST
+}
+run_test 51c "rmdir .../t-0 --- .../t-$NUMTEST ===================="
+
+test_51d() {
+        [  "$OSTCOUNT" -lt "3" ] && skip "skipping test with few OSTs" && return
+        mkdir -p $DIR/d51d
+        createmany -o $DIR/d51d/t- 1000
+        $LFS getstripe $DIR/d51d > $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
+
+        NLAST=0
+        for N in `seq 1 $((OSTCOUNT - 1))`; do
+	    [ ${OBJS[$N]} -lt $((${OBJS[$NLAST]} - 20)) ] && \
+		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)) ] && \
+		error "OST $N has less #0 objects vs OST $NLAST (${OBJS0[$N]} < ${OBJS0[$NLAST]}"
+	    NLAST=$N
+        done
+}
+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
-	echo bar >> $DIR/d52a/foo || error
-	cp /etc/hosts $DIR/d52a/foo && error
-	rm -f $DIR/d52a/foo 2>/dev/null && error
-	link $DIR/d52a/foo $DIR/d52a/foo_link 2>/dev/null && error
-	echo foo >> $DIR/d52a/foo || error
-	mrename $DIR/d52a/foo $DIR/d52a/foo_ren && error
-	lsattr $DIR/d52a/foo | egrep -q "^-+a-+ $DIR/d52a/foo" || error
-	chattr -a $DIR/d52a/foo || error
+	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-+ $DIR/d52a/foo" || error "lsattr"
+	chattr -a $DIR/d52a/foo || error "chattr -a failed"
 
-	rm -fr $DIR/d52a || error
+	rm -fr $DIR/d52a || error "cleanup rm failed"
 }
-run_test 52a "append-only flag test ============================"
+run_test 52a "append-only flag test (should return errors) ====="
 
 test_52b() {
 	[ -f $DIR/d52b/foo ] && chattr -i $DIR/d52b/foo
@@ -1488,12 +2316,13 @@ test_52b() {
 
 	rm -fr $DIR/d52b || error
 }
-run_test 52b "immutable flag test =============================="
+run_test 52b "immutable flag test (should return errors) ======="
 
 test_53() {
-        for i in /proc/fs/lustre/osc/OSC*mds1 ; do
-                ostname=`echo $i | cut -d _ -f 3-4 | sed -e s/_mds1//`
-                ost_last=`cat /proc/fs/lustre/obdfilter/$ostname/last_id`
+	# only test MDT0000 
+        for i in `ls -d $LPROC/osc/*-osc-MDT0000 2> /dev/null` ; do
+                ostname=`basename $i | cut -d - -f 1-2`
+                ost_last=`cat $LPROC/obdfilter/$ostname/last_id`
                 mds_last=`cat $i/prealloc_last_id`
                 echo "$ostname.last_id=$ost_last ; MDS.last_id=$mds_last"
                 if [ $ost_last != $mds_last ]; then
@@ -1501,77 +2330,968 @@ test_53() {
                 fi
         done
 }
-run_test 53 "verify that MDS and OSTs agree on pre-creation====="
+run_test 53 "verify that MDS and OSTs agree on pre-creation ===="
 
-test_54() {
-     	$SOCKETSERVER $DIR/socket &
-	sleep 1
+test_54a() {
+        [ ! -f "$SOCKETSERVER" ] && skip "no socketserver, skipping" && return
+        [ ! -f "$SOCKETCLIENT" ] && skip "no socketclient, skipping" && return
+     	$SOCKETSERVER $DIR/socket
      	$SOCKETCLIENT $DIR/socket || error
       	$MUNLINK $DIR/socket
 }
-run_test 54 "unix damain socket test ==========================="
+run_test 54a "unix domain socket test =========================="
+
+test_54b() {
+	f="$DIR/f54b"
+	mknod $f c 1 3
+	chmod 0666 $f
+	dd if=/dev/zero of=$f bs=`page_size` count=1 
+}
+run_test 54b "char device works in lustre ======================"
+
+find_loop_dev() {
+	[ -b /dev/loop/0 ] && LOOPBASE=/dev/loop/
+	[ -b /dev/loop0 ] && LOOPBASE=/dev/loop
+	[ -z "$LOOPBASE" ] && echo "/dev/loop/0 and /dev/loop0 gone?" && return
+
+	for i in `seq 3 7`; do
+		losetup $LOOPBASE$i > /dev/null 2>&1 && continue
+		LOOPDEV=$LOOPBASE$i
+		LOOPNUM=$i
+		break
+	done
+}
+
+test_54c() {
+	tfile="$DIR/f54c"
+	tdir="$DIR/d54c"
+	loopdev="$DIR/loop54c"
+
+	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)..."
+	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
+	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
+	dd if=$tdir/tmp of=/dev/zero bs=`page_size` count=30 || error "dd read"
+	$UMOUNT $tdir
+	losetup -d $loopdev
+	rm $loopdev
+}
+run_test 54c "block device works in lustre ====================="
+
+test_54d() {
+	f="$DIR/f54d"
+	string="aaaaaa"
+	mknod $f p
+	[ "$string" = `echo $string > $f | cat $f` ] || error
+}
+run_test 54d "fifo device works in lustre ======================"
+
+test_54e() {
+	check_kernel_version 46 || return 0
+	f="$DIR/f54e"
+	string="aaaaaa"
+	mknod $f c 4 0
+	echo $string > $f || error
+}
+run_test 54e "console/tty device works in lustre ======================"
+
+check_fstype() {
+	grep -q $FSTYPE /proc/filesystems && return 1
+	modprobe $FSTYPE
+	grep -q $FSTYPE /proc/filesystems && return 1
+	insmod ../$FSTYPE/$FSTYPE.o
+	grep -q $FSTYPE /proc/filesystems && return 1
+	insmod ../$FSTYPE/$FSTYPE.ko
+	grep -q $FSTYPE /proc/filesystems && return 1
+	return 0
+}
+
+test_55() {
+        rm -rf $DIR/d55
+        mkdir $DIR/d55
+        check_fstype && skip "can't find fs $FSTYPE" && return
+        mount -t $FSTYPE -o loop,iopen $EXT2_DEV $DIR/d55 || error "mounting"
+        touch $DIR/d55/foo
+        $IOPENTEST1 $DIR/d55/foo $DIR/d55 || error "running $IOPENTEST1"
+        $IOPENTEST2 $DIR/d55 || error "running $IOPENTEST2"
+        echo "check for $EXT2_DEV. Please wait..."
+        rm -rf $DIR/d55/*
+        $UMOUNT $DIR/d55 || error "unmounting"
+}
+run_test 55 "check iopen_connect_dentry() ======================"
+
+test_56() {
+        rm -rf $DIR/d56
+        $SETSTRIPE -d $DIR
+        mkdir $DIR/d56
+        mkdir $DIR/d56/dir
+        NUMFILES=3
+        NUMFILESx2=$(($NUMFILES * 2))
+        for i in `seq 1 $NUMFILES` ; do
+                touch $DIR/d56/file$i
+                touch $DIR/d56/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."
+
+        # test lfs getstripe with file instead of dir
+        FILENUM=`$GETSTRIPE $DIR/d56/file1 | grep -c obdidx`
+        [ $FILENUM  -eq 1 ] || error \
+                 "lfs getstripe $DIR/d56/file1 wrong:found $FILENUM, expected 1"
+        echo "lfs getstripe file 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."
+
+        #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"
+
+        [  "$OSTCOUNT" -lt 2 ] && \
+                skip "skipping other lfs getstripe --obd test" && return
+        FILENUM=`$GETSTRIPE --recursive $DIR/d56 | sed -n '/^[	 ]*1[	 ]/p' | wc -l`
+        OBDUUID=`$GETSTRIPE --recursive $DIR/d56 | sed -n '/^[	 ]*1:/p' | awk '{print $2}'`
+        FOUND=`$GETSTRIPE -r --obd $OBDUUID $DIR/d56 | wc -l`
+        [ $FOUND -eq $FILENUM ] || \
+                error "lfs getstripe --obd wrong: found $FOUND, expected $FILENUM"
+        [ `$GETSTRIPE -r -v --obd $OBDUUID $DIR/d56 | sed '/^[	 ]*1[	 ]/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 56 "check lfs getstripe ===================================="
+
+NUMFILES=3
+NUMDIRS=3
+setup_56() {
+        LOCAL_NUMFILES=$1
+        LOCAL_NUMDIRS=$2
+        if [ ! -d "$DIR/${tdir}g" ] ; then
+                mkdir -p $DIR/${tdir}g
+                for i in `seq 1 $LOCAL_NUMFILES` ; do
+                        touch $DIR/${tdir}g/file$i
+                done
+                for i in `seq 1 $LOCAL_NUMDIRS` ; do
+                        mkdir $DIR/${tdir}g/dir$i
+                        for j in `seq 1 $LOCAL_NUMFILES` ; do
+                                touch $DIR/${tdir}g/dir$i/file$j
+                        done
+                done
+        fi
+}
+
+test_56g() {
+        $LSTRIPE -d $DIR
+
+        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"
+        done
+        echo "lfs find -name passed."
+}
+run_test 56g "check lfs find -name ============================="
+
+test_56h() {
+        $LSTRIPE -d $DIR
+
+        setup_56 $NUMFILES $NUMDIRS
+
+        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"
+        done
+        echo "lfs find ! -name passed."
+}
+run_test 56h "check lfs find ! -name ============================="
+
+test_57a() {
+	# note test will not do anything if MDS is not local
+	[ -z "$MDS" ] && skip "skipping test for remote MDS" && return
+	for DEV in `cat $LPROC/mds/*/mntdev`; do
+		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
+	done
+}
+run_test 57a "verify MDS filesystem created with large inodes =="
+
+test_57b() {
+	FILECOUNT=100
+	FILE1=$DIR/d57b/f1
+	FILEN=$DIR/d57b/f$FILECOUNT
+	rm -rf $DIR/d57b || error "removing $DIR/d57b"
+	mkdir -p $DIR/d57b || error "creating $DIR/d57b"
+	echo "mcreating $FILECOUNT files"
+	createmany -m $DIR/d57b/f 1 $FILECOUNT || \
+		error "creating files in $DIR/d57b"
+
+	# verify that files do not have EAs yet
+	$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="`cat $LPROC/mds/*/kbytesfree 2> /dev/null`"
+	MDCFREE="`cat $LPROC/mdc/*/kbytesfree | head -n 1`"
+	echo "opening files to create objects/EAs"
+	for FILE in `seq -f $DIR/d57b/f%g 1 $FILECOUNT`; do
+		$OPENFILE -f O_RDWR $FILE > /dev/null || error "opening $FILE"
+	done
+
+	# verify that files have EAs now
+	$GETSTRIPE $FILE1 | grep -q "obdidx" || error "$FILE1 missing EA"
+	$GETSTRIPE $FILEN | grep -q "obdidx" || error "$FILEN missing EA"
+
+	sleep 1 # make sure we get new statfs data
+#	MDSFREE2="`cat $LPROC/mds/*/kbytesfree`"
+#	MDCFREE2="`cat $LPROC/mdc/*/kbytesfree`"
+#	if [ "$MDCFREE2" -lt "$((MDCFREE - 8))" ]; then
+#		if [ "$MDSFREE" != "$MDSFREE2" ]; then
+#			error "MDC before $MDCFREE != after $MDCFREE2"
+#		else
+#			echo "MDC before $MDCFREE != after $MDCFREE2"
+#			echo "unable to confirm if MDS has large inodes"
+#		fi
+#	fi
+	rm -rf $DIR/d57b
+}
+run_test 57b "default LOV EAs are stored inside large inodes ==="
+
+test_58() {
+    [ -z "$(which wiretest 2>/dev/null)" ] && skip "could not find wiretest" && return
+    wiretest
+}
+run_test 58 "verify cross-platform wire constants =============="
 
 test_59() {
 	echo "touch 130 files"
-	for i in `seq 1 130` ; do
-		touch $DIR/59-$i
-	done
+	createmany -o $DIR/f59- 130
 	echo "rm 130 files"
-	for i in `seq 1 130` ; do
-		rm -f $DIR/59-$i
-	done
+	unlinkmany $DIR/f59- 130
 	sync
 	sleep 2
         # wait for commitment of removal
 }
-run_test 59 "verify cancellation of llog records async=========="
+run_test 59 "verify cancellation of llog records async ========="
 
-test_60() {
-	echo 60 "llog tests run from kernel mode"
-	sh run-llog.sh
+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
+}
+run_test 60a "llog sanity tests run from kernel module =========="
+
+test_60b() { # bug 6411
+	dmesg > $DIR/$tfile
+	LLOG_COUNT=`dmesg | grep -A 1000 "$TEST60_HEAD" | grep -c llog_test`
+	[ $LLOG_COUNT -gt 50 ] && error "CDEBUG_LIMIT not limiting messages"|| true
+}
+run_test 60b "limit repeated messages from CERROR/CWARN ========"
+ 
+test_60c() {
+	echo "create 5000 files" 
+	createmany -o $DIR/f60c- 5000
+#define OBD_FAIL_MDS_LLOG_CREATE_FAILED  0x13c
+        sysctl -w lustre.fail_loc=0x8000013c
+	unlinkmany $DIR/f60c- 5000
+        sysctl -w lustre.fail_loc=0
 }
-run_test 60 "llog sanity tests run from kernel module =========="
+run_test 60c "unlink file when mds full"
 
 test_61() {
 	f="$DIR/f61"
 	dd if=/dev/zero of=$f bs=`page_size` count=1
-	cancel_lru_locks OSC
+	cancel_lru_locks osc
 	multiop $f OSMWUc || error
 	sync
 }
-run_test 61 "mmap() writes don't make sync hang =========="
+run_test 61 "mmap() writes don't make sync hang ================"
 
 # bug 2330 - insufficient obd_match error checking causes LBUG
 test_62() {
         f="$DIR/f62"
         echo foo > $f
-        cancel_lru_locks OSC
-        echo 0x405 > /proc/sys/lustre/fail_loc
-        cat $f && error # expect -EIO
-        multiop $f Owc && error
-        echo 0 > /proc/sys/lustre/fail_loc
+        cancel_lru_locks osc
+        sysctl -w lustre.fail_loc=0x405
+        cat $f && error "cat succeeded, expect -EIO"
+        sysctl -w lustre.fail_loc=0
 }
 run_test 62 "verify obd_match failure doesn't LBUG (should -EIO)"
 
-# bug 2319 - osic_wait() interrupted causes crash because of invalid waitq.
+# bug 2319 - oig_wait() interrupted causes crash because of invalid waitq.
 test_63() {
-	MAX_DIRTY_MB=`cat /proc/fs/lustre/osc/*/max_dirty_mb | head -1`
-	for i in /proc/fs/lustre/osc/*/max_dirty_mb ; do
-	echo 0 > $i
+	MAX_DIRTY_MB=`cat $LPROC/osc/*/max_dirty_mb | head -n 1`
+	for i in $LPROC/osc/*/max_dirty_mb ; do
+		echo 0 > $i
 	done
 	for i in `seq 10` ; do
-		dd if=/dev/zero of=$DIR/syncwrite_testfile bs=8k &
+		dd if=/dev/zero of=$DIR/f63 bs=8k &
 		sleep 5
 		kill $!
 		sleep 1
 	done
 
-	for i in /proc/fs/lustre/osc/*/max_dirty_mb ; do
+	for i in $LPROC/osc/*/max_dirty_mb ; do
 		echo $MAX_DIRTY_MB > $i
 	done
+	rm -f $DIR/f63 || true
+}
+run_test 63 "Verify oig_wait interruption does not crash ======="
+
+# bug 2248 - async write errors didn't return to application on sync
+# bug 3677 - async write errors left page locked
+test_63b() {
+	DBG_SAVE="`sysctl -n lnet.debug`"
+	sysctl -w lnet.debug=-1
+
+	# ensure we have a grant to do async writes
+	dd if=/dev/zero of=$DIR/$tfile bs=4k count=1
+	rm $DIR/$tfile
+
+	#define OBD_FAIL_OSC_BRW_PREP_REQ        0x406
+	sysctl -w lustre.fail_loc=0x80000406
+	multiop $DIR/$tfile Owy && \
+		$LCTL dk /tmp/test63b.debug && \
+		sysctl -w lnet.debug="$DBG_SAVE" && \
+		error "sync didn't return ENOMEM"
+	sync; sleep 2; sync	# do a real sync this time to flush page
+	grep locked $LPROC/llite/*/dump_page_cache && \
+		$LCTL dk /tmp/test63b.debug && \
+		sysctl -w lnet.debug="$DBG_SAVE" && \
+		error "locked page left in cache after async error" || true
+	sysctl -w lnet.debug="$DBG_SAVE"
+}
+run_test 63b "async write errors should be returned to fsync ==="
+
+test_64a () {
+	df $DIR
+	grep "[0-9]" $LPROC/osc/*[oO][sS][cC][_-]*/cur*
+}
+run_test 64a "verify filter grant calculations (in kernel) ====="
+
+test_64b () {
+        [ ! -f oos.sh ] && skip "missing subtest oos.sh" && return
+	sh oos.sh $MOUNT
+}
+run_test 64b "check out-of-space detection on client ==========="
+
+# 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"
+}
+run_test 65a "directory with no stripe info ===================="
+
+test_65b() {
+	mkdir -p $DIR/d65
+	$SETSTRIPE $DIR/d65 $(($STRIPESIZE * 2)) 0 1 || error "setstripe"
+	touch $DIR/d65/f2
+	$LVERIFY $DIR/d65 $DIR/d65/f2 || error "lverify failed"
+}
+run_test 65b "directory setstripe $(($STRIPESIZE * 2)) 0 1 ==============="
+
+test_65c() {
+	if [ $OSTCOUNT -gt 1 ]; then
+		mkdir -p $DIR/d65
+    		$SETSTRIPE $DIR/d65 $(($STRIPESIZE * 4)) 1 \
+			$(($OSTCOUNT - 1)) || error "setstripe"
+		touch $DIR/d65/f3
+		$LVERIFY $DIR/d65 $DIR/d65/f3 || error "lverify failed"
+	fi
+}
+run_test 65c "directory setstripe $(($STRIPESIZE * 4)) 1 $(($OSTCOUNT - 1))"
+
+if [ $STRIPECOUNT -eq 0 ]; then
+	sc=1
+elif [ $STRIPECOUNT -gt 160 ]; then
+#LOV_MAX_STRIPE_COUNT is 160, 4294967295(-1) is included.
+	[ $OSTCOUNT -gt 160 ] && sc=160 || sc=$(($OSTCOUNT - 1))
+else
+	sc=$(($STRIPECOUNT - 1))
+fi
+
+test_65d() {
+	mkdir -p $DIR/d65
+	$SETSTRIPE $DIR/d65 $STRIPESIZE -1 $sc || error "setstripe"
+	touch $DIR/d65/f4 $DIR/d65/f5
+	$LVERIFY $DIR/d65 $DIR/d65/f4 $DIR/d65/f5 || error "lverify failed"
+}
+run_test 65d "directory setstripe $STRIPESIZE -1 $sc =============="
+
+test_65e() {
+	mkdir -p $DIR/d65
+
+	$SETSTRIPE $DIR/d65 0 -1 0 || error "setstripe"
+        $GETSTRIPE -v $DIR/d65 | grep "has no stripe info" || error "no stripe info failed"
+	touch $DIR/d65/f6
+	$LVERIFY $DIR/d65 $DIR/d65/f6 || error "lverify failed"
+}
+run_test 65e "directory setstripe 0 -1 0 ======================="
+
+test_65f() {
+	mkdir -p $DIR/d65f
+	$RUNAS $SETSTRIPE $DIR/d65f 0 -1 0 && error "setstripe succeeded" || true
+}
+run_test 65f "dir setstripe permission (should return error) ==="
+
+test_65g() {
+        mkdir -p $DIR/d65
+        $SETSTRIPE $DIR/d65 $(($STRIPESIZE * 2)) 0 1 || error "setstripe"
+        $SETSTRIPE -d $DIR/d65 || error "setstripe"
+        $GETSTRIPE -v $DIR/d65 | grep "has no stripe info" || \
+		error "delete default stripe failed"
+}
+run_test 65g "directory setstripe -d ==========================="
+
+test_65h() {
+        mkdir -p $DIR/d65
+        $SETSTRIPE $DIR/d65 $(($STRIPESIZE * 2)) 0 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"
+}
+run_test 65h "directory stripe info inherit ===================="
+ 
+test_65i() { # bug6367
+        $SETSTRIPE $MOUNT 65536 -1 -1
+}
+run_test 65i "set non-default striping on root directory (bug 6367)="
+
+test_65j() { # bug6367
+	# if we aren't already remounting for each test, do so for this test
+	if [ "$CLEANUP" = ":" -a "$I_MOUNTED" = "yes" ]; then
+		cleanup -f || error "failed to unmount"
+		setup
+	fi
+	$SETSTRIPE -d $MOUNT
+}
+run_test 65j "set default striping on root directory (bug 6367)="
+
+test_65k() { # bug11679
+        [ "$OSTCOUNT" -lt 2 ] && skip "too few OSTs" && return
+
+        echo "Check OST status: "
+        MDS_OSCS=`do_facet mds 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
+        done
+        mkdir -p $DIR/$tdir
+        for INACTIVE_OSC in $MDS_OSCS; do
+                echo $INACTIVE_OSC "is Deactivate:"
+                do_facet mds lctl --device  %$INACTIVE_OSC deactivate
+                for STRIPE_OSC in $MDS_OSCS; do
+                        STRIPE_OST=`osc_to_ost $STRIPE_OSC`
+                        STRIPE_INDEX=`do_facet mds cat $LPROC/lov/*md*/target_obd |
+                                      grep $STRIPE_OST | awk -F: '{print $1}'`
+                        echo "$SETSTRIPE $DIR/$tdir/${STRIPE_INDEX} 0 ${STRIPE_INDEX} 1"
+                        do_facet mds $SETSTRIPE $DIR/$tdir/${STRIPE_INDEX} 0 ${STRIPE_INDEX} 1
+                        RC=$?
+                        [ $RC -ne 0 ] && error "setstripe should have succeeded"
+                done
+                rm -f $DIR/$tdir/*
+                echo $INACTIVE_OSC "is Activate."
+                do_facet mds lctl --device  %$INACTIVE_OSC activate
+        done
+}
+run_test 65k "validate manual striping works properly with deactivated OSCs"
+
+# bug 2543 - update blocks count on client
+test_66() {
+	COUNT=${COUNT:-8}
+	dd if=/dev/zero of=$DIR/f66 bs=1k count=$COUNT
+	sync; sleep 1; sync
+	BLOCKS=`ls -s $DIR/f66 | awk '{ print $1 }'`
+	[ $BLOCKS -ge $COUNT ] || error "$DIR/f66 blocks $BLOCKS < $COUNT"
+}
+run_test 66 "update inode blocks count on client ==============="
+
+test_67() {
+        [ ! -f sanity-sec.sh ] && skip "missing subtest sanity-sec.sh" && return
+	sh sanity-sec.sh
+}
+run_test 67 "security test ====================================="
+
+cleanup_68() {
+	trap 0
+	if [ "$LOOPDEV" ]; then
+		swapoff $LOOPDEV || error "swapoff failed"
+		losetup -d $LOOPDEV || error "losetup -d failed"
+		unset LOOPDEV LOOPNUM
+	fi
+	rm -f $DIR/f68
+}
+
+meminfo() {
+	awk '($1 == "'$1':") { print $2 }' /proc/meminfo
+}
+
+swap_used() {
+	swapon -s | awk '($1 == "'$1'") { print $4 }'
+}
+
+# excercise swapping to lustre by adding a high priority swapfile entry
+# and then consuming memory until it is used.
+test_68() {
+	[ "$UID" != 0 ] && skip "must run as root" && return
+	grep -q obdfilter $LPROC/devices && \
+		skip "local OST" && return
+
+	find_loop_dev
+	dd if=/dev/zero of=$DIR/f68 bs=64k count=1024
+
+	trap cleanup_68 EXIT
+
+	losetup $LOOPDEV $DIR/f68 || error "losetup $LOOPDEV failed"
+	mkswap $LOOPDEV
+	swapon -p 32767 $LOOPDEV || error "swapon $LOOPDEV failed"
+
+	echo "before: `swapon -s | grep $LOOPDEV`"
+	KBFREE=`meminfo MemTotal`
+	$MEMHOG $KBFREE || error "error allocating $KBFREE kB"
+	echo "after: `swapon -s | grep $LOOPDEV`"
+	SWAPUSED=`swap_used $LOOPDEV`
+
+	cleanup_68
+
+	[ $SWAPUSED -eq 0 ] && echo "no swap used???" || true
+}
+run_test 68 "support swapping to Lustre ========================"
+
+# bug5265, obdfilter oa2dentry return -ENOENT
+# #define OBD_FAIL_OST_ENOENT 0x217
+test_69() {
+	[ $(grep -c obdfilter $LPROC/devices) -eq 0 ] && \
+		skip "skipping test for remote OST" && return
+	[ ! -z "$USING_KRB5" ] && \
+		skip "gss with bulk security will triger oops. re-enable this after b10091 get fixed" && return
+
+	f="$DIR/$tfile"
+	touch $f
+
+	if ! $DIRECTIO write ${f}.2 0 1; then
+		skip "O_DIRECT not implemented"
+		return 0
+	fi
+
+	sysctl -w lustre.fail_loc=0x217
+	truncate $f 1 # vmtruncate() will ignore truncate() error.
+	$DIRECTIO write $f 0 2 && error "write succeeded, expect -ENOENT"
+
+	sysctl -w lustre.fail_loc=0
+	$DIRECTIO write $f 0 2 || error "write error"
+
+	cancel_lru_locks osc
+	$DIRECTIO read $f 0 1 || error "read error"
+
+	sysctl -w lustre.fail_loc=0x217
+	$DIRECTIO read $f 1 1 && error "read succeeded, expect -ENOENT"
+
+	sysctl -w lustre.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 lib to $DIR"
+	[ -d /lib64 ] && LIB71=/lib64 || LIB71=/lib
+	mkdir -p $DIR$LIB71 || error "can't create $DIR$LIB71"
+	cp $LIB71/libc* $DIR$LIB71 || error "can't copy $LIB71/libc*"
+	cp $LIB71/ld-* $DIR$LIB71 || error "can't create $LIB71/ld-*"
+
+	echo "chroot $DIR /dbench -c client.txt 2"
+	chroot $DIR /dbench -c client.txt 2
+	RC=$?
+
+	rm -rf $DIR/dbench $TGT $DIR$LIB71
+
+	return $RC
+}
+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
+	# We had better clear the $DIR to get enough space for dd
+	rm -rf $DIR/*
+	touch $DIR/f72
+	chmod 777 $DIR/f72
+	chmod ug+s $DIR/f72
+	$RUNAS -u $(($RUNAS_ID + 1)) dd if=/dev/zero of=$DIR/f72 bs=512 count=1 || error
+	# See if we are still setuid/sgid
+	test -u $DIR/f72 -o -g $DIR/f72 && error "S/gid is not dropped on write"
+	# 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
 }
-run_test 63 "Verify osic_wait interruption does not crash"
+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-2
+	multiop $DIR/d73-1/f73-1 O_c &
+	pid1=$!
+	#give multiop a chance to open
+	usleep 500
+
+	echo 0x80000129 > /proc/sys/lustre/fail_loc
+	multiop $DIR/d73-1/f73-2 Oc &
+	sleep 1
+	echo 0 > /proc/sys/lustre/fail_loc
+
+	multiop $DIR/d73-2/f73-3 Oc &
+	pid3=$!
+
+	kill -USR1 $pid1
+	wait $pid1 || return 1
+
+	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 
+
+	rm -rf $DIR/d73-*
+}
+run_test 73 "multiple MDC requests (should not deadlock)"
+
+test_74() { # bug 6149, 6184
+	#define OBD_FAIL_LDLM_ENQUEUE_OLD_EXPORT 0x30e
+	#
+	# very important to OR with OBD_FAIL_ONCE (0x80000000) -- otherwise it
+	# will spin in a tight reconnection loop
+	sysctl -w lustre.fail_loc=0x8000030e
+	# get any lock
+	touch $DIR/f74
+	sysctl -w lustre.fail_loc=0
+	true
+}
+run_test 74 "ldlm_enqueue freed-export error path (shouldn't LBUG)"
+
+JOIN=${JOIN:-"lfs join"}
+F75=$DIR/f75
+F128k=${F75}_128k
+FHEAD=${F75}_head
+FTAIL=${F75}_tail
+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"
+        log "finished cmp $FHEAD to ${F75}_sim_sim"
+        $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
+        $JOIN ${FHEAD} ${FTAIL} || error "join ${FHEAD} ${FTAIL} error"
+        cmp ${FHEAD} ${F75}_join_sim || \
+                error "${FHEAD} ${F75}_join_sim are different"
+        $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
+        $JOIN ${FTAIL} ${FHEAD} || error "join error"
+        cmp ${FTAIL} ${F75}_sim_join || \
+                error "${FTAIL} ${F75}_sim_join are different"
+        $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
+        cat ${F75}_sim_join >> ${F75}_join_join
+        $JOIN ${FHEAD} ${FHEAD}_tmp || error "join ${FHEAD} ${FHEAD}_tmp error"
+        $JOIN ${FHEAD} ${FTAIL} || error "join ${FHEAD} ${FTAIL} error"
+        cmp ${FHEAD} ${F75}_join_join ||error "${FHEAD} ${F75}_join_join differ"        $CHECKSTAT -a ${FHEAD}_tmp || error "${FHEAD}_tmp exist after join"
+        $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
+                cat ${F128k} >> ${F75}_join_10_compare
+                cp -p ${F128k} ${FTAIL}
+                $JOIN ${F75}_join_10 ${FTAIL} || \
+                        error "join ${F75}_join_10 ${FTAIL} error"
+                $CHECKSTAT -a ${FTAIL} || error "tail file exist after join"
+        done
+        cmp ${F75}_join_10 ${F75}_join_10_compare || \
+                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) ===================="
+
+num_inodes() {
+	awk '/lustre_inode_cache/ {print $2; exit}' /proc/slabinfo
+}
+
+test_76() { # bug 1443
+	DETH=$(grep deathrow /proc/kallsyms /proc/ksyms 2> /dev/null | wc -l)
+	[ $DETH -eq 0 ] && skip "No _iget." && return 0
+        BEFORE_INODES=`num_inodes`
+	echo "before inodes: $BEFORE_INODES"
+	for i in `seq 1000`; do
+		touch $DIR/$tfile
+		rm -f $DIR/$tfile
+	done
+	AFTER_INODES=`num_inodes`
+	echo "after inodes: $AFTER_INODES"
+	[ $AFTER_INODES -gt $((BEFORE_INODES + 32)) ] && \
+		error "inode slab grew from $BEFORE_INODES to $AFTER_INODES"
+	true
+}
+run_test 76 "destroy duplicate inodes in client inode cache ===="
+
+export ORIG_CSUM=""
+set_checksums()
+{
+	[ "$ORIG_CSUM" ]||ORIG_CSUM=`cat $LPROC/llite/*/checksum_pages|head -n1`
+	for f in $LPROC/llite/*/checksum_pages; do
+		echo $1 >> $f
+	done
+
+	return 0
+}
+
+F77_TMP=$TMP/f77-temp
+F77SZ=8
+setup_f77() {
+	dd if=/dev/urandom of=$F77_TMP bs=1M count=$F77SZ || \
+		error "error writing to $F77_TMP"
+}
+
+test_77a() { # bug 10889
+	[ ! -f $F77_TMP ] && setup_f77
+	set_checksums 1
+	dd if=$F77_TMP of=$DIR/$tfile bs=1M count=$F77SZ || error "dd error"
+	set_checksums 0
+}
+run_test 77a "normal checksum read/write operation ============="
+
+test_77b() { # bug 10889
+	[ ! -f $F77_TMP ] && setup_f77
+	#define OBD_FAIL_OSC_CHECKSUM_SEND       0x409
+	sysctl -w lustre.fail_loc=0x80000409
+	set_checksums 1
+	dd if=$F77_TMP of=$DIR/f77b bs=1M count=$F77SZ conv=sync || \
+		error "dd error: $?"
+	sysctl -w lustre.fail_loc=0
+	set_checksums 0
+}
+run_test 77b "checksum error on client write ===================="
+
+test_77c() { # bug 10889
+	[ ! -f $DIR/f77b ] && skip "requires 77b - skipping" && return  
+	cancel_lru_locks osc
+	#define OBD_FAIL_OSC_CHECKSUM_RECEIVE    0x408
+	sysctl -w lustre.fail_loc=0x80000408
+	set_checksums 1
+	cmp $F77_TMP $DIR/f77b || error "file compare failed"
+	sysctl -w lustre.fail_loc=0
+	set_checksums 0
+}
+run_test 77c "checksum error on client read ==================="
+
+test_77d() { # bug 10889
+	#define OBD_FAIL_OSC_CHECKSUM_SEND       0x409
+	sysctl -w lustre.fail_loc=0x80000409
+	set_checksums 1
+	directio write $DIR/f77 0 $F77SZ $((1024 * 1024)) || \
+		error "direct write: rc=$?"
+	sysctl -w lustre.fail_loc=0
+	set_checksums 0
+}
+run_test 77d "checksum error on OST direct write ==============="
+
+test_77e() { # bug 10889
+	[ ! -f $DIR/f77 ] && skip "requires 77d - skipping" && return  
+	#define OBD_FAIL_OSC_CHECKSUM_RECEIVE    0x408
+	sysctl -w lustre.fail_loc=0x80000408
+	set_checksums 1
+	cancel_lru_locks osc
+	directio read $DIR/f77 0 $F77SZ $((1024 * 1024)) || \
+		error "direct read: rc=$?"
+	sysctl -w lustre.fail_loc=0
+	set_checksums 0
+}
+run_test 77e "checksum error on OST direct read ================"
+
+test_77f() { # bug 10889
+	#define OBD_FAIL_OSC_CHECKSUM_SEND       0x409
+	sysctl -w lustre.fail_loc=0x409
+	set_checksums 1
+	directio write $DIR/f77 0 $F77SZ $((1024 * 1024)) && \
+		error "direct write succeeded"
+	sysctl -w lustre.fail_loc=0
+	set_checksums 0
+}
+run_test 77f "repeat checksum error on write (expect error) ===="
+
+test_77g() { # bug 10889
+	[ $(grep -c obdfilter $LPROC/devices) -eq 0 ] && \
+		skip "remote OST" && return
+	[ ! -f $F77_TMP ] && setup_f77
+	#define OBD_FAIL_OST_CHECKSUM_RECEIVE       0x21a
+	sysctl -w lustre.fail_loc=0x8000021a
+	set_checksums 1
+	dd if=$F77_TMP of=$DIR/f77 bs=1M count=$F77SZ || \
+		error "write error: rc=$?"
+	sysctl -w lustre.fail_loc=0
+	set_checksums 0
+}
+run_test 77g "checksum error on OST write ======================"
+
+test_77h() { # bug 10889
+	[ $(grep -c obdfilter $LPROC/devices) -eq 0 ] && \
+		skip "remote OST" && return
+	[ ! -f $DIR/f77 ] && skip "requires 77g - skipping" && return  
+	cancel_lru_locks osc
+	#define OBD_FAIL_OST_CHECKSUM_SEND          0x21b
+	sysctl -w lustre.fail_loc=0x8000021b
+	set_checksums 1
+	cmp $F77_TMP $DIR/f77 || error "file compare failed"
+	sysctl -w lustre.fail_loc=0
+	set_checksums 0
+}
+run_test 77h "checksum error on OST read ======================="
+
+[ "$ORIG_CSUM" ] && set_checksums $ORIG_CSUM || true
+rm -f $F77_TMP
+unset F77_TMP
+
+test_78() { # bug 10901
+ 	NSEQ=5
+	F78SIZE=$(($(awk '/MemFree:/ { print $2 }' /proc/meminfo) / 1024))
+	[ $F78SIZE -gt 512 ] && F78SIZE=512
+	[ $F78SIZE -gt $((MAXFREE / 1024)) ] && F78SIZE=$((MAXFREE / 1024))
+	SMALLESTOST=`lfs df $DIR |grep OST | awk '{print $4}' |sort -n |head -1`
+	[ $F78SIZE -gt $((SMALLESTOST * $OSTCOUNT / 1024)) ] && \
+		F78SIZE=$((SMALLESTOST * $OSTCOUNT / 1024))
+	$SETSTRIPE $DIR/$tfile 0 -1 -1 || error "setstripe failed"
+ 	for i in `seq 1 $NSEQ`
+ 	do
+ 		echo directIO rdwr round $i of $NSEQ
+  	 	$DIRECTIO rdwr $DIR/$tfile 0 $F78SIZE 1048576 || error "rdwr failed"
+  	done
+
+	rm -f $DIR/$tfile
+}
+run_test 78 "handle large O_DIRECT writes correctly ============"
 
 # on the LLNL clusters, runas will still pick up root's $TMP settings,
 # which will not be writable for the runas user, and then you get a CVS
@@ -1585,7 +3305,6 @@ OLDHOME=$HOME
 [ $RUNAS_ID -ne $UID ] && HOME=/tmp
 
 test_99a() {
-	echo 99 "cvs operations ===================================="
 	mkdir -p $DIR/d99cvsroot
 	chown $RUNAS_ID $DIR/d99cvsroot
 	$RUNAS cvs -d $DIR/d99cvsroot init || error
@@ -1593,14 +3312,19 @@ test_99a() {
 run_test 99a "cvs init ========================================="
 
 test_99b() {
-	[ ! -d $DIR/d99cvsroot ] && run_one 99a
+	[ ! -d $DIR/d99cvsroot ] && test_99a
 	cd /etc/init.d
-	$RUNAS cvs -d $DIR/d99cvsroot import -m "nomesg" d99reposname vtag rtag
+	# some versions of cvs import exit(1) when asked to import links or
+	# files they can't read.  ignore those files.
+	TOIGNORE=$(find . -type l -printf '-I %f\n' -o \
+			! -perm +4 -printf '-I %f\n')
+	$RUNAS cvs -d $DIR/d99cvsroot import -m "nomesg" $TOIGNORE \
+		d99reposname vtag rtag
 }
 run_test 99b "cvs import ======================================="
 
 test_99c() {
-	[ ! -d $DIR/d99cvsroot ] && run_one 99b
+	[ ! -d $DIR/d99cvsroot ] && test_99b
 	cd $DIR
 	mkdir -p $DIR/d99reposname
 	chown $RUNAS_ID $DIR/d99reposname
@@ -1609,7 +3333,7 @@ test_99c() {
 run_test 99c "cvs checkout ====================================="
 
 test_99d() {
-	[ ! -d $DIR/d99cvsroot ] && run_one 99c
+	[ ! -d $DIR/d99cvsroot ] && test_99c
 	cd $DIR/d99reposname
 	$RUNAS touch foo99
 	$RUNAS cvs add -m 'addmsg' foo99
@@ -1617,28 +3341,825 @@ test_99d() {
 run_test 99d "cvs add =========================================="
 
 test_99e() {
-	[ ! -d $DIR/d99cvsroot ] && run_one 99c
+	[ ! -d $DIR/d99cvsroot ] && test_99c
 	cd $DIR/d99reposname
 	$RUNAS cvs update
 }
 run_test 99e "cvs update ======================================="
 
 test_99f() {
-	[ ! -d $DIR/d99cvsroot ] && run_one 99d
+	[ ! -d $DIR/d99cvsroot ] && test_99d
 	cd $DIR/d99reposname
 	$RUNAS cvs commit -m 'nomsg' foo99
 }
 run_test 99f "cvs commit ======================================="
 
+test_100() {
+	netstat -tna | while read PROT SND RCV LOCAL REMOTE STAT; do
+		[ "$PROT" != "tcp" ] && continue
+		RPORT=`echo $REMOTE | cut -d: -f2`
+		[ "$RPORT" != "$ACCEPTOR_PORT" ] && continue
+		LPORT=`echo $LOCAL | cut -d: -f2`
+		if [ $LPORT -ge 1024 ]; then
+			echo "bad: $PROT $SND $RCV $LOCAL $REMOTE $STAT"
+			netstat -tna
+			error "local: $LPORT > 1024, remote: $RPORT"
+		fi
+	done
+	true
+}
+run_test 100 "check local port using privileged port ==========="
+
+function get_named_value()
+{
+    local tag
+
+    tag=$1
+    while read ;do
+        line=$REPLY
+        case $line in
+        $tag*)
+            echo $line | sed "s/^$tag//"
+            break
+            ;;
+        esac
+    done
+}
+
+export CACHE_MAX=`cat $LPROC/llite/*/max_cached_mb | head -n 1`
+cleanup_101() {
+	for s in $LPROC/llite/*/max_cached_mb; do
+		echo $CACHE_MAX > $s
+	done
+	trap 0
+}
+
+test_101() {
+	local s
+	local discard
+	local nreads=10000
+	[ "$CPU" = "UML" ] && nreads=1000
+	local cache_limit=32
+
+	for s in $LPROC/osc/*-osc*/rpc_stats; do
+		echo 0 > $s
+	done
+	trap cleanup_101 EXIT
+	for s in $LPROC/llite/*; do
+		echo 0 > $s/read_ahead_stats
+		echo $cache_limit > $s/max_cached_mb
+	done
+
+	#
+	# randomly read 10000 of 64K chunks from file 3x 32MB in size
+	#
+	echo "nreads: $nreads file size: $((cache_limit * 3))MB"
+	$RANDOM_READS -f $DIR/$tfile -s$((cache_limit * 3192 * 1024)) -b65536 -C -n$nreads -t 180
+
+	discard=0
+	for s in $LPROC/llite/*; do
+		discard=$(($discard + $(cat $s/read_ahead_stats | get_named_value 'read but discarded')))
+	done
+	cleanup_101
+
+	if [ $(($discard * 10)) -gt $nreads ] ;then
+		for s in $LPROC/osc/*-osc*/rpc_stats; do
+			echo $s; cat $s
+		done
+		for s in $LPROC/llite/*/read_ahead_stats; do
+			echo $s; cat $s
+		done
+		error "too many ($discard) discarded pages" 
+	fi
+	rm -f $DIR/$tfile || true
+}
+run_test 101 "check read-ahead for random reads ================"
+
+export SETUP_TEST102=no
+setup_test102() {
+	[ "$SETUP_TEST102" = "yes" ] && return
+	mkdir -p $DIR/$tdir
+	STRIPE_SIZE=65536
+	STRIPE_COUNT=4 
+	STRIPE_OFFSET=2
+
+	trap cleanup_test102 EXIT
+	cd $DIR
+	$SETSTRIPE $tdir $STRIPE_SIZE  $STRIPE_OFFSET $STRIPE_COUNT
+	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 
+			do
+				local stripe_size=`expr $STRIPE_SIZE \* $num`
+				local file=file"$num-$offset-$count"
+				$SETSTRIPE $file $stripe_size  $offset $count
+			done
+		done
+	done
+
+	cd ..
+	star -c  f=$TMP/f102.tar $tdir 
+	SETUP_TEST102=yes
+}
+
+cleanup_test102() {
+	[ "SETUP_TEST102" = "YES" ] || return
+	trap 0
+	rm -f $TMP/f102.tar
+	rm -rf $DIR/$tdir
+	SETUP_TEST102=no
+}
+
+test_102a() {
+	local testfile=$DIR/xattr_testfile
+
+	rm -f $testfile
+        touch $testfile
+
+	[ "$UID" != 0 ] && skip "must run as root" && return
+	[ -z "`grep xattr $LPROC/mdc/*-mdc-*/connect_flags`" ] && skip "must have user_xattr" && return
+
+	[ -z "$(which setfattr 2>/dev/null)" ] && skip "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 user.author1 -v author1 $testfile || error
+        [ "`getfattr -n user.author1 $testfile 2> /dev/null | \
+        grep "user.author1"`" == "user.author1=\"author1\"" ] || error
+
+	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
+
+	echo "remove xattr..."
+        setfattr -x trusted.name1 $testfile || error
+        getfattr -d -m trusted $testfile 2> /dev/null | \
+        grep "trusted.name1" && error || true
+
+        setfattr -x user.author1 $testfile || error
+        getfattr -d -m user $testfile 2> /dev/null | \
+        grep "user.author1" && error || true
+
+	# 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
+}
+run_test 102a "user xattr test =================================="
+
+test_102b() {
+	# b10930: get/set/list trusted.lov xattr
+	echo "get/set/list trusted.lov xattr ..."
+	[ "$OSTCOUNT" -lt "2" ] && skip "skipping 2-stripe test" && return
+	local testfile=$DIR/$tfile
+	$SETSTRIPE $testfile 65536 1 2
+	getfattr -d -m "^trusted" $testfile 2> /dev/null | \
+	grep "trusted.lov" || error "can't get trusted.lov from $testfile"
+
+	local testfile2=${testfile}2
+	local value=`getfattr -n trusted.lov $testfile 2> /dev/null | \
+		     grep "trusted.lov" |sed -e 's/[^=]\+=//'`
+	
+	$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 2 ] || error "stripe count $stripe_count != 2"
+}
+run_test 102b "getfattr/setfattr for trusted.lov EAs ============"
+
+test_102c() {
+	# b10930: get/set/list trusted.lov xattr
+	echo "get/set/list trusted.lov xattr ..."
+	[ "$OSTCOUNT" -lt "2" ] && skip "skipping 2-stripe test" && return
+	mkdir -p $DIR/$tdir
+	chown $RUNAS_ID $DIR/$tdir
+	local testfile=$DIR/$tdir/$tfile
+	$RUNAS $SETSTRIPE $testfile 65536 1 2
+	$RUNAS getfattr -d -m "^trusted" $testfile 2> /dev/null | \
+	grep "trusted.lov" || error "can't get trusted.lov from $testfile"
+
+	local testfile2=${testfile}2
+	local value=`getfattr -n trusted.lov $testfile 2> /dev/null | \
+		     grep "trusted.lov" |sed -e 's/[^=]\+=//'  `
+	
+	$RUNAS $MCREATE $testfile2
+	$RUNAS setfattr -n trusted.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}'`
+	[ $stripe_size -eq 65536 ] || error "stripe size $stripe_size != 65536"
+	[ $stripe_count -eq 2 ] || error "stripe count $stripe_count != 2"
+}
+run_test 102c "non-root getfattr/setfattr for trusted.lov EAs ==========="
+
+get_stripe_info() {
+	stripe_size=0
+	stripe_count=0
+	stripe_offset=0
+	local lines=`sed -n '/obdidx/=' $1`
+	stripe_size=`awk '{if($1~/size/) print $2}' $1`
+	stripe_count=`awk '{if($1~/count/) print $2}' $1`
+	lines=`expr $lines + 1`
+	stripe_offset=`sed -n ${lines}p $1 |awk '{print $1}'`
+}
+
+compare_stripe_info1() {
+	for num in 1 2 3 4
+	do
+		for count in 1 2 3 4
+		do
+			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 
+				get_stripe_info  $tmp_file
+				if test $stripe_size -ne $size
+				then
+					error "$file: different stripe size" && return
+				fi
+				if test $stripe_count -ne $count
+				then
+					error "$file: different stripe count" && return
+				fi
+				if test $stripe_offset -ne 0
+				then
+					error "$file: different stripe offset" && return
+				fi
+				rm -f $tmp_file
+			done
+		done
+	done
+}
+
+compare_stripe_info2() {
+	for num in 1 2 3 4
+	do
+		for count in 1 2 3 4
+		do
+			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
+				get_stripe_info  $tmp_file
+				if test $stripe_size -ne $size
+				then
+					error "$file: different stripe size" && return	
+				fi
+				if test $stripe_count -ne $count
+				then
+					error "$file: different stripe count" && return
+				fi
+				if test $stripe_offset -ne $offset
+				then
+					error "$file: different stripe offset" && return
+				fi
+				rm -f $tmp_file
+			done
+		done
+	done
+}
+
+test_102d() {
+	# b10930: star test for trusted.lov xattr
+	star --xhelp 2>&1 | grep -q nolustre  
+	if [ $? -ne 0 ]
+	then
+		skip "being skipped because a lustre-aware star is not installed." && return
+	fi
+	[ "$OSTCOUNT" -lt "4" ] && skip "skipping 4-stripe test" && return
+	setup_test102
+	mkdir -p $DIR/d102d
+	star -x  f=$TMP/f102.tar -C $DIR/d102d
+	cd $DIR/d102d/$tdir
+	compare_stripe_info1
+
+}
+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  
+	if [ $? -ne 0 ]
+	then
+		skip "being skipped because a lustre-aware star is not installed." && return
+	fi
+	[ "$OSTCOUNT" -lt "4" ] && skip "skipping 4-stripe test" && return
+	setup_test102
+	mkdir -p $DIR/d102e
+	star -x  -preserve-osts f=$TMP/f102.tar -C $DIR/d102e
+	cd $DIR/d102e/$tdir
+	compare_stripe_info2
+}
+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  
+	if [ $? -ne 0 ]
+	then
+		skip "being skipped because a lustre-aware star is not installed." && return
+	fi
+	[ "$OSTCOUNT" -lt "4" ] && skip "skipping 4-stripe test" && return
+	setup_test102
+	mkdir -p $DIR/d102f
+	cd $DIR
+	star -copy  $tdir $DIR/d102f
+	cd $DIR/d102f/$tdir
+	compare_stripe_info1
+}
+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  
+	if [ $? -ne 0 ]
+	then
+		skip "being skipped because a lustre-aware star is not installed." && return
+	fi
+	[ "$OSTCOUNT" -lt "4" ] && skip "skipping 4-stripe test" && return
+	setup_test102
+	mkdir -p $DIR/d102g
+	cd $DIR
+	star -copy -preserve-osts $tdir $DIR/d102g
+	cd $DIR/d102g/$tdir
+	compare_stripe_info2
+	cleanup_test102
+}
+run_test 102g "star copy files, keep osts ==========="
+
+run_acl_subtest()
+{
+    $SAVE_PWD/acl/run $SAVE_PWD/acl/$1.test
+    return $?
+}
+
+test_103 () {
+    [ "$UID" != 0 ] && skip "must run as root" && return
+    [ -z "$(grep acl $LPROC/mdc/*-mdc-*/connect_flags)" ] && skip "must have acl enabled" && return
+    [ -z "$(which setfacl 2>/dev/null)" ] && skip "could not find setfacl" && return
+    [ ! -z "$USING_KRB5" ] && skip "could not run under gss" && return
+
+    SAVE_UMASK=`umask`
+    umask 0022
+    cd $DIR
+
+    echo "performing cp ..."
+    run_acl_subtest cp || error
+    echo "performing getfacl-noacl..."
+    run_acl_subtest getfacl-noacl || error
+    echo "performing misc..."
+    run_acl_subtest misc || error
+#    XXX add back permission test when we support supplementary groups.
+#    echo "performing permissions..."
+#    run_acl_subtest permissions || error
+    echo "performing setfacl..."
+    run_acl_subtest setfacl || error
+
+    # inheritance test got from HP
+    echo "performing inheritance..."
+    cp $SAVE_PWD/acl/make-tree . || error
+    chmod +x make-tree || error
+    run_acl_subtest inheritance || error
+    rm -f make-tree
+
+    cd $SAVE_PWD
+    umask $SAVE_UMASK
+}
+run_test 103 "acl test ========================================="
+
+test_104() {
+	touch $DIR/$tfile
+	lfs df || error "lfs df failed"
+	lfs df -ih || error "lfs df -ih failed"
+	lfs df -h $DIR || error "lfs df -h $DIR failed"
+	lfs df -i $DIR || error "lfs df -i $DIR failed"
+	lfs df $DIR/$tfile || error "lfs df $DIR/$tfile failed"
+	lfs df -ih $DIR/$tfile || error "lfs df -ih $DIR/$tfile failed"
+	
+	OSC=`awk '/-osc-/ {print $4}' $LPROC/devices | head -n 1`
+	lctl --device %$OSC deactivate
+	lfs df || error "lfs df with deactivated OSC failed"
+	lctl --device %$OSC recover
+	lfs df || error "lfs df with reactivated OSC failed"
+}
+run_test 104 "lfs df [-ih] [path] test ========================="
+
+test_105a() {
+	# doesn't work on 2.4 kernels
+        touch $DIR/$tfile
+        if [ -n "`mount | grep \"$DIR.*flock\" | grep -v noflock`" ];
+        then
+                flocks_test on -f $DIR/$tfile || error "fail flock on"
+        else
+                flocks_test off -f $DIR/$tfile || error "fail flock off"
+        fi
+}
+run_test 105a "flock when mounted without -o flock test ========"
+
+test_105b() {
+        touch $DIR/$tfile
+        if [ -n "`mount | grep \"$DIR.*flock\" | grep -v noflock`" ];
+        then
+                flocks_test on -c $DIR/$tfile || error "fail flock on"
+        else
+                flocks_test off -c $DIR/$tfile || error "fail flock off"
+        fi
+}
+run_test 105b "fcntl when mounted without -o flock test ========"
+
+test_105c() {
+        touch $DIR/$tfile
+        if [ -n "`mount | grep \"$DIR.*flock\" | grep -v noflock`" ];
+        then
+                flocks_test on -l $DIR/$tfile || error "fail flock on"
+        else
+                flocks_test off -l $DIR/$tfile || error "fail flock off"
+        fi
+}
+run_test 105c "lockf when mounted without -o flock test ========"
+
+test_106() { #bug 10921
+	mkdir $DIR/$tdir || error "mkdir $DIR/$tdir failed"
+	$DIR/$tdir && error "exec $DIR/$tdir succeeded"
+	chmod 777 $DIR/$tdir || error "chmod $DIR/$tdir failed"
+}
+run_test 106 "attempt exec of dir followed by chown of that dir"
+
+test_107() {
+        CDIR=`pwd`
+        cd $DIR
+        ulimit -c unlimited
+        sleep 60 &
+        SLEEPPID=$!
+
+        file=`cat /proc/sys/kernel/core_pattern`
+        core_pid=`cat /proc/sys/kernel/core_uses_pid`
+        [ $core_pid -eq 1 ] && file=$file.$SLEEPPID
+        rm -f $file
+        sleep 1
+
+        kill -s 11 $SLEEPPID
+        wait $SLEEPPID
+        if [ -e $file ]; then
+                size=`stat -c%s $file`
+                [ $size -eq 0 ] && error "Fail to create core file $file"
+        else
+                error "Fail to create core file $file"
+        fi
+        rm -f $file
+        cd $CDIR
+}
+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
+}
+run_test 110 "filename length checking"
+
+test_115() {
+	OSTIO_pre=$(ps -e|grep ll_ost_io|awk '{print $4}'|sort -n|tail -1|\
+	    cut -c11-20)
+        [ -z "$OSTIO_pre" ] && skip "no OSS threads" && \
+	    return
+        echo "Starting with $OSTIO_pre threads"
+
+	NUMTEST=20000
+	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
+	createmany -o $DIR/$tdir/$tfile $NUMTEST
+	unlinkmany $DIR/$tdir/$tfile $NUMTEST
+
+	OSTIO_post=$(ps -e|grep ll_ost_io|awk '{print $4}'|sort -n|tail -1|\
+	    cut -c11-20)
+
+	# don't return an error
+        [ $OSTIO_post -eq $OSTIO_pre ] && echo \
+	    "FAIL: No addition 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"
+}
+run_test 115 "verify dynamic thread creation===================="
+
+free_min_max () {
+        AVAIL=($(cat $LPROC/osc/*[oO][sS][cC]-[^M]*/kbytesavail))
+        echo OST kbytes available: ${AVAIL[@]}
+	MAXI=0; MAXV=${AVAIL[0]}
+	MINI=0; MINV=${AVAIL[0]}
+	for ((i = 0; i < ${#AVAIL[@]}; i++)); do
+	    #echo OST $i: ${AVAIL[i]}kb
+	    if [ ${AVAIL[i]} -gt $MAXV ]; then
+		MAXV=${AVAIL[i]}; MAXI=$i
+	    fi
+	    if [ ${AVAIL[i]} -lt $MINV ]; then
+		MINV=${AVAIL[i]}; MINI=$i
+	    fi
+	done
+	echo Min free space: OST $MINI: $MINV 
+	echo Max free space: OST $MAXI: $MAXV 
+}
+
+test_116() {
+	[ "$OSTCOUNT" -lt "2" ] && skip "$OSTCOUNT < 2 OSTs" && return
+	[ $(grep -c obdfilter $LPROC/devices) -eq 0 ] &&
+		skip "remote MDS, skipping test" && return
+
+	echo -n "Free space priority "
+	cat $LPROC/lov/*-clilov-*/qos_prio_free
+       	DELAY=$(cat $LPROC/lov/*-clilov-*/qos_maxage | head -1 | awk '{print $1}')
+	declare -a AVAIL
+	free_min_max
+	[ $MINV -gt 960000 ] && skip "too much free space in OST$MINI, skip" &&\
+		return
+
+	# generate uneven OSTs
+	mkdir -p $DIR/$tdir/OST${MINI}
+	declare -i FILL
+	FILL=$(($MINV / 4))
+	echo "Filling 25% remaining space in OST${MINI} with ${FILL}Kb"
+	$SETSTRIPE $DIR/$tdir/OST${MINI} 0 $MINI 1
+	i=0
+	while [ $FILL -gt 0 ]; do
+	    i=$(($i + 1))
+	    dd if=/dev/zero of=$DIR/$tdir/OST${MINI}/$tfile-$i bs=2M count=1 2>/dev/null
+	    FILL=$(($FILL - 2048))
+	    echo -n .
+	done
+	FILL=$(($MINV / 4))
+	sync
+	sleep $DELAY
+
+	free_min_max
+	DIFF=$(($MAXV - $MINV))
+	DIFF2=$(($DIFF * 100 / $MINV))
+	echo -n "diff=${DIFF}=${DIFF2}% must be > 20% for QOS mode..."
+	if [ $DIFF2 -gt 20 ]; then
+	    echo "ok"
+	else
+	    echo "failed - QOS mode won't be used"
+	    error "QOS imbalance criteria not met"
+	    return
+	fi
+
+	MINI1=$MINI; MINV1=$MINV
+	MAXI1=$MAXI; MAXV1=$MAXV
+
+	# now fill using QOS
+	echo writing a bunch of files to QOS-assigned OSTs
+	$SETSTRIPE $DIR/$tdir 0 -1 1
+	i=0
+	while [ $FILL -gt 0 ]; do
+	    i=$(($i + 1))
+	    dd if=/dev/zero of=$DIR/$tdir/$tfile-$i bs=1024 count=200 2>/dev/null
+	    FILL=$(($FILL - 200))
+	    echo -n .
+	done
+	echo "wrote $i 200k files"
+	sync
+	sleep $DELAY
+
+	echo "Note: free space may not be updated, so measurements might be off"
+	free_min_max
+	DIFF2=$(($MAXV - $MINV))
+	echo "free space delta: orig $DIFF final $DIFF2"
+	[ $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 
+	UUID=$(awk '/'$MINI1': / {print $2; exit}' $LPROC/lov/${FSNAME}-clilov-*/target_obd)
+	echo $UUID
+        MINC=$($LFS getstripe --obd $UUID $DIR/$tdir | wc -l)
+	echo "$MINC files created on smaller OST $MINI1"
+	UUID=$(awk '/'$MAXI1': / {print $2; exit}' $LPROC/lov/${FSNAME}-clilov-*/target_obd)
+	echo $UUID
+        MAXC=$($LFS 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"
+}
+run_test 116 "stripe QOS: free space balance ==================="
+
+test_117() # bug 10891
+{
+        dd if=/dev/zero of=$DIR/$tfile bs=1M count=1
+        #define OBD_FAIL_OST_SETATTR_CREDITS 0x21e
+        sysctl -w lustre.fail_loc=0x21e
+        > $DIR/$tfile || error "truncate failed"
+        sysctl -w lustre.fail_loc=0
+        echo "Truncate succeeded."
+}
+run_test 117 "verify fsfilt_extend =========="
+
+test_118() #bug 11710
+{
+	sync; sleep 1; sync
+	multiop $DIR/$tfile oO_CREAT:O_RDWR:O_SYNC:w4096c;
+	dirty=$(grep -c dirty $LPROC/llite/*/dump_page_cache)
+	
+	return $dirty
+}
+run_test 118 "verify O_SYNC work"
+
+test_119a() # bug 11737
+{
+        BSIZE=$((512 * 1024))
+        directio write $DIR/$tfile 0 1 $BSIZE
+        # We ask to read two blocks, which is more than a file size.
+        # directio will indicate an error when requested and actual
+        # sizes aren't equeal (a normal situation in this case) and
+        # print actual read amount.
+        NOB=`directio read $DIR/$tfile 0 2 $BSIZE | awk '/error/ {print $6}'`
+        if [ "$NOB" != "$BSIZE" ]; then
+                error "read $NOB bytes instead of $BSIZE"
+        fi
+        rm -f $DIR/$tfile
+}
+run_test 119a "Short directIO read must return actual read amount"
+
+test_119b() # bug 11737
+{
+        [ "$OSTCOUNT" -lt "2" ] && skip "skipping 2-stripe test" && return
+
+        lfs setstripe $DIR/$tfile 0 -1 2
+        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)) || \
+                error "direct read failed"
+}
+run_test 119b "Sparse directIO read must return actual read amount"
+
+test_119a() {
+        mkdir $DIR/$tdir
+        cancel_lru_locks mdc
+        stat $DIR/$tdir > /dev/null
+        can1=`awk '/ldlm_cancel/ {print $2}' $LPROC/ldlm/services/ldlm_canceld/stats`
+        blk1=`awk '/ldlm_bl_callback/ {print $2}' $LPROC/ldlm/services/ldlm_cbd/stats`
+        mkdir $DIR/$tdir/d1
+        can2=`awk '/ldlm_cancel/ {print $2}' $LPROC/ldlm/services/ldlm_canceld/stats`
+        blk2=`awk '/ldlm_bl_callback/ {print $2}' $LPROC/ldlm/services/ldlm_cbd/stats`
+        [ $can1 -eq $can2 ] || error $((can2-can1)) "cancel RPC occured."
+        [ $blk1 -eq $blk2 ] || error $((blk2-blk1)) "blocking RPC occured."
+}
+run_test 119a "Early Lock Cancel: mkdir test"
+
+test_119b() {
+        mkdir $DIR/$tdir
+        cancel_lru_locks mdc
+        stat $DIR/$tdir > /dev/null
+        can1=`awk '/ldlm_cancel/ {print $2}' $LPROC/ldlm/services/ldlm_canceld/stats`
+        blk1=`awk '/ldlm_bl_callback/ {print $2}' $LPROC/ldlm/services/ldlm_cbd/stats`
+        touch $DIR/$tdir/f1
+        blk2=`awk '/ldlm_bl_callback/ {print $2}' $LPROC/ldlm/services/ldlm_cbd/stats`
+        can2=`awk '/ldlm_cancel/ {print $2}' $LPROC/ldlm/services/ldlm_canceld/stats`
+        [ $can1 -eq $can2 ] || error $((can2-can1)) "cancel RPC occured."
+        [ $blk1 -eq $blk2 ] || error $((blk2-blk1)) "blocking RPC occured."
+}
+run_test 119b "Early Lock Cancel: create test"
+
+test_119c() {
+        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
+        can1=`awk '/ldlm_cancel/ {print $2}' $LPROC/ldlm/services/ldlm_canceld/stats`
+        blk1=`awk '/ldlm_bl_callback/ {print $2}' $LPROC/ldlm/services/ldlm_cbd/stats`
+        ln $DIR/$tdir/d1/f1 $DIR/$tdir/d2/f2
+        can2=`awk '/ldlm_cancel/ {print $2}' $LPROC/ldlm/services/ldlm_canceld/stats`
+        blk2=`awk '/ldlm_bl_callback/ {print $2}' $LPROC/ldlm/services/ldlm_cbd/stats`
+        [ $can1 -eq $can2 ] || error $((can2-can1)) "cancel RPC occured."
+        [ $blk1 -eq $blk2 ] || error $((blk2-blk1)) "blocking RPC occured."
+}
+run_test 119c "Early Lock Cancel: link test"
+
+test_119d() {
+        touch $DIR/$tdir
+        cancel_lru_locks mdc
+        stat $DIR/$tdir > /dev/null
+        can1=`awk '/ldlm_cancel/ {print $2}' $LPROC/ldlm/services/ldlm_canceld/stats`
+        blk1=`awk '/ldlm_bl_callback/ {print $2}' $LPROC/ldlm/services/ldlm_cbd/stats`
+        chmod a+x $DIR/$tdir
+        can2=`awk '/ldlm_cancel/ {print $2}' $LPROC/ldlm/services/ldlm_canceld/stats`
+        blk2=`awk '/ldlm_bl_callback/ {print $2}' $LPROC/ldlm/services/ldlm_cbd/stats`
+        [ $can1 -eq $can2 ] || error $((can2-can1)) "cancel RPC occured."
+        [ $blk1 -eq $blk2 ] || error $((blk2-blk1)) "blocking RPC occured."
+}
+run_test 119d "Early Lock Cancel: setattr test"
+
+test_119e() {
+        mkdir $DIR/$tdir
+        dd if=/dev/zero of=$DIR/$tdir/f1 count=1
+        cancel_lru_locks mdc
+        cancel_lru_locks osc
+        dd if=$DIR/$tdir/f1 of=/dev/null
+        stat $DIR/$tdir $DIR/$tdir/f1 > /dev/null
+        can1=`awk '/ldlm_cancel/ {print $2}' $LPROC/ldlm/services/ldlm_canceld/stats`
+        blk1=`awk '/ldlm_bl_callback/ {print $2}' $LPROC/ldlm/services/ldlm_cbd/stats`
+        unlink $DIR/$tdir/f1
+        can2=`awk '/ldlm_cancel/ {print $2}' $LPROC/ldlm/services/ldlm_canceld/stats`
+        blk2=`awk '/ldlm_bl_callback/ {print $2}' $LPROC/ldlm/services/ldlm_cbd/stats`
+        [ $can1 -eq $can2 ] || error $((can2-can1)) "cancel RPC occured."
+        [ $blk1 -eq $blk2 ] || error $((blk2-blk1)) "blocking RPC occured."
+}
+run_test 119e "Early Lock Cancel: unlink test"
+
+test_119f() {
+        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
+        cancel_lru_locks osc
+        dd if=$DIR/$tdir/d1/f1 of=/dev/null
+        dd if=$DIR/$tdir/d2/f2 of=/dev/null
+        stat $DIR/$tdir/d1 $DIR/$tdir/d2 $DIR/$tdir/d1/f1 $DIR/$tdir/d2/f2 > /dev/null
+        can1=`awk '/ldlm_cancel/ {print $2}' $LPROC/ldlm/services/ldlm_canceld/stats`
+        blk1=`awk '/ldlm_bl_callback/ {print $2}' $LPROC/ldlm/services/ldlm_cbd/stats`
+        mv $DIR/$tdir/d1/f1 $DIR/$tdir/d2/f2
+        can2=`awk '/ldlm_cancel/ {print $2}' $LPROC/ldlm/services/ldlm_canceld/stats`
+        blk2=`awk '/ldlm_bl_callback/ {print $2}' $LPROC/ldlm/services/ldlm_cbd/stats`
+        [ $can1 -eq $can2 ] || error $((can2-can1)) "cancel RPC occured."
+        [ $blk1 -eq $blk2 ] || error $((blk2-blk1)) "blocking RPC occured."
+}
+run_test 119f "Early Lock Cancel: rename test"
+
+test_119g() {
+        count=10000
+        echo create $count files
+        mkdir  $DIR/$tdir
+        cancel_lru_locks mdc
+        cancel_lru_locks osc
+        t0=`date +%s`
+
+        can0=`awk '/ldlm_cancel/ {print $2}' $LPROC/ldlm/services/ldlm_canceld/stats`
+        blk0=`awk '/ldlm_bl_callback/ {print $2}' $LPROC/ldlm/services/ldlm_cbd/stats`
+        createmany -o $DIR/$tdir/f $count
+        sync
+        can1=`awk '/ldlm_cancel/ {print $2}' $LPROC/ldlm/services/ldlm_canceld/stats`
+        blk1=`awk '/ldlm_bl_callback/ {print $2}' $LPROC/ldlm/services/ldlm_cbd/stats`
+        t1=`date +%s`
+        echo total: $((can1-can0)) cancels, $((blk1-blk0)) blockings
+        echo rm $count files
+        rm -r $DIR/$tdir
+        sync
+        can2=`awk '/ldlm_cancel/ {print $2}' $LPROC/ldlm/services/ldlm_canceld/stats`
+        blk2=`awk '/ldlm_bl_callback/ {print $2}' $LPROC/ldlm/services/ldlm_cbd/stats`
+        t2=`date +%s`
+        echo total: $count removes in $((t2-t1))
+        echo total: $((can2-can1)) cancels, $((blk2-blk1)) blockings
+        sleep 2
+        # wait for commitment of removal
+}
+run_test 119g "Early Lock Cancel: performance test"
+
 TMPDIR=$OLDTMPDIR
 TMP=$OLDTMP
 HOME=$OLDHOME
 
 log "cleanup: ======================================================"
-if [ "$I_MOUNTED" = "yes" -a "`mount | grep ^$NAME`" ]; then
-	rm -rf $DIR/[Rdfs][1-9]*
-	sh llmountcleanup.sh || error
+if [ "`mount | grep $MOUNT`" ]; then
+    rm -rf $DIR/[Rdfs][1-9]*
 fi
+if [ "$I_MOUNTED" = "yes" ]; then
+    cleanupall -f || error "cleanup failed"
+fi
+
 
 echo '=========================== finished ==============================='
-[ -f "$SANITYLOG" ] && cat $SANITYLOG && exit 1 || true
+[ -f "$SANITYLOG" ] && cat $SANITYLOG && grep -q FAIL $SANITYLOG && exit 1 || true
+echo "$0: completed"