X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Ftests%2Fsanity.sh;h=c70826e01325b24511c4ba383b14919e97331f5d;hp=739b6936b34b2b1c8dc7b6db1209bb517ca0e5b5;hb=ac37e7b4d101761bbff401ed12fcf671d6b68f9c;hpb=82bea2e0b50171b6b6f9a5c52ce17c80c7c22de8

diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh
index 739b693..c70826e 100644
--- a/lustre/tests/sanity.sh
+++ b/lustre/tests/sanity.sh
@@ -9,7 +9,7 @@ set -e
 
 ONLY=${ONLY:-"$*"}
 # bug number for skipped test: 13297 2108 9789 3637 9789 3561 12622 5188
-ALWAYS_EXCEPT="                27u   42a  42b  42c  42d  45   51d   68b   $SANITY_EXCEPT"
+ALWAYS_EXCEPT="                42a  42b  42c  42d  45   51d   68b   $SANITY_EXCEPT"
 # UPDATE THE COMMENT ABOVE WITH BUG NUMBERS WHEN CHANGING ALWAYS_EXCEPT!
 
 # with LOD/OSP landing
@@ -17,11 +17,6 @@ ALWAYS_EXCEPT="                27u   42a  42b  42c  42d  45   51d   68b   $SANIT
 ALWAYS_EXCEPT="                 76     $ALWAYS_EXCEPT"
 
 
-# Tests that fail on uml
-CPU=`awk '/model/ {print $4}' /proc/cpuinfo`
-#                                    buffer i/o errs             sock spc runas
-[ "$CPU" = "UML" ] && EXCEPT="$EXCEPT 27m 27n 27o 27p 27q 27r 31d 54a  64b 99a 99b 99c 99d 99e 99f 101a"
-
 SRCDIR=$(cd $(dirname $0); echo $PWD)
 export PATH=$PATH:/sbin
 
@@ -63,7 +58,11 @@ init_test_env $@
 . ${CONFIG:=$LUSTRE/tests/cfg/${NAME}.sh}
 init_logging
 
-[ "$SLOW" = "no" ] && EXCEPT_SLOW="24o 24v 27m 36f 36g 36h 51b 60c 63 64b 68 71 73 77f 78 101a 103 115 120g 124b"
+[ "$SLOW" = "no" ] && EXCEPT_SLOW="24o 27m 64b 68 71 77f 78 115 124b"
+
+[ $(facet_fstype $SINGLEMDS) = "zfs" ] &&
+# bug number for skipped test:        LU-1593 LU-2610 LU-2833 LU-1957 LU-2805
+	ALWAYS_EXCEPT="$ALWAYS_EXCEPT 34h     40      48a     180     184c"
 
 FAIL_ON_ERROR=false
 
@@ -90,6 +89,13 @@ check_kernel_version() {
 	return 1
 }
 
+check_swap_layouts_support()
+{
+	$LCTL get_param -n llite.*.sbi_flags | grep -q layout ||
+		{ skip "Does not support layout lock."; return 0; }
+	return 1
+}
+
 if [ "$ONLY" == "cleanup" ]; then
        sh llmountcleanup.sh
        exit 0
@@ -469,9 +475,18 @@ str_repeat() {
 
 # Long symlinks and LU-2241
 test_17g() {
-        test_mkdir -p $DIR/$tdir
+	test_mkdir -p $DIR/$tdir
 	local TESTS="59 60 61 4094 4095"
 
+	# Fix for inode size boundary in 2.1.4
+	[ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.1.4) ] &&
+		TESTS="4094 4095"
+
+	# Patch not applied to 2.2 or 2.3 branches
+	[ $(lustre_version_code $SINGLEMDS) -ge $(version_code 2.2.0) ] &&
+	[ $(lustre_version_code $SINGLEMDS) -le $(version_code 2.3.55) ] &&
+		TESTS="4094 4095"
+
 	for i in $TESTS; do
 		local SYMNAME=$(str_repeat 'x' $i)
 		ln -s $SYMNAME $DIR/$tdir/f$i || error "failed $i-char symlink"
@@ -520,12 +535,12 @@ test_17k() { #bug 22301
         rsync --help | grep -q xattr ||
                 skip_env "$(rsync --version| head -1) does not support xattrs"
 	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
-        test_mkdir -p $DIR/$tdir
+	test_mkdir -p $DIR/$tdir
 	test_mkdir -p $DIR/$tdir.new
-        touch $DIR/$tdir/$tfile
-        ln -s $DIR/$tdir/$tfile $DIR/$tdir/$tfile.lnk
-        rsync -av -X $DIR/$tdir/ $DIR/$tdir.new ||
-                error "rsync failed with xattrs enabled"
+	touch $DIR/$tdir/$tfile
+	ln -s $DIR/$tdir/$tfile $DIR/$tdir/$tfile.lnk
+	rsync -av -X $DIR/$tdir/ $DIR/$tdir.new ||
+		error "rsync failed with xattrs enabled"
 }
 run_test 17k "symlinks: rsync with xattrs enabled ========================="
 
@@ -662,9 +677,33 @@ test_17n() {
 }
 run_test 17n "run e2fsck against master/slave MDT which contains remote dir"
 
+test_17o() {
+	local WDIR=$DIR/${tdir}o
+	local mdt_index
+	local mdtdevname
+	local rc=0
+
+	mkdir -p $WDIR
+	mdt_index=$($LFS getstripe -M $WDIR)
+	mdt_index=$((mdt_index+1))
+	mdtdevname=$(mdsdevname $mdt_index)
+
+	touch $WDIR/$tfile
+	stop mds${mdt_index}
+	start mds${mdt_index} $mdtdevname $MDS_MOUNT_OPTS
+
+	#define OBD_FAIL_OSD_LMA_INCOMPAT 0x194
+	do_facet mds${mdt_index} lctl set_param fail_loc=0x194
+	ls -l $WDIR/$tfile && rc=1
+	do_facet mds${mdt_index} lctl set_param fail_loc=0
+	[[ $rc -ne 0 ]] && error "stat file should fail"
+	true
+}
+run_test 17o "stat file with incompat LMA feature"
+
 test_18() {
-	touch $DIR/f
-	ls $DIR || error
+	touch $DIR/f || error "Failed to touch $DIR/f: $?"
+	ls $DIR || error "Failed to ls $DIR: $?"
 }
 run_test 18 "touch .../f ; ls ... =============================="
 
@@ -911,20 +950,26 @@ test_24p() {
 }
 run_test 24p "mkdir .../R12{a,b}; rename .../R12a .../R12b"
 
+cleanup_multiop_pause() {
+	trap 0
+	kill -USR1 $MULTIPID
+}
+
 test_24q() {
 	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	test_mkdir $DIR/R13a
 	test_mkdir $DIR/R13b
-	DIRINO=`ls -lid $DIR/R13a | awk '{ print $1 }'`
-	multiop_bg_pause $DIR/R13b D_c || return 1
+	local DIRINO=$(ls -lid $DIR/R13a | awk '{ print $1 }')
+	multiop_bg_pause $DIR/R13b D_c || error "multiop failed to start"
 	MULTIPID=$!
 
+	trap cleanup_multiop_pause EXIT
 	mrename $DIR/R13a $DIR/R13b
-	$CHECKSTAT -a $DIR/R13a || error
-	$CHECKSTAT -t dir $DIR/R13b || error
-	DIRINO2=`ls -lid $DIR/R13b | awk '{ print $1 }'`
+	$CHECKSTAT -a $DIR/R13a || error "R13a still exists"
+	$CHECKSTAT -t dir $DIR/R13b || error "R13b does not exist"
+	local DIRINO2=$(ls -lid $DIR/R13b | awk '{ print $1 }')
 	[ "$DIRINO" = "$DIRINO2" ] || error "R13a $DIRINO != R13b $DIRINO2"
-	kill -USR1 $MULTIPID
+	cleanup_multiop_pause
 	wait $MULTIPID || error "multiop close failed"
 }
 run_test 24q "mkdir .../R13{a,b}; open R13b rename R13a R13b ==="
@@ -1098,6 +1143,11 @@ test_24z() {
 	mrename $remote_src $remote_tgt &&
 		error "rename remote dirs should not work!"
 
+	# If target dir does not exists, it should succeed
+	rm -rf $remote_tgt
+	mrename $remote_src $remote_tgt ||
+		error "rename remote dirs(tgt dir does not exists) failed!"
+
 	rm -rf $DIR/$tdir || error "Can not delete directories"
 }
 run_test 24z "rename one remote dir to another remote dir should fail"
@@ -1220,7 +1270,7 @@ run_test 27e "setstripe existing file (should return error) ======"
 test_27f() {
 	test_mkdir -p $DIR/d27
 	$SETSTRIPE -S 100 -i 0 -c 1 $DIR/d27/fbad && error "setstripe failed"
-	dd if=/dev/zero of=$DIR/d27/f12 bs=4k count=4 || error "dd failed"
+	dd if=/dev/zero of=$DIR/d27/fbad bs=4k count=4 || error "dd failed"
 	$GETSTRIPE $DIR/d27/fbad || error "$GETSTRIPE failed"
 }
 run_test 27f "setstripe with bad stripe size (should return error)"
@@ -1473,21 +1523,24 @@ test_27t() { # bug 10864
 run_test 27t "check that utils parse path correctly"
 
 test_27u() { # bug 4900
-        [ "$OSTCOUNT" -lt "2" ] && skip_env "too few OSTs" && return
-        remote_mds_nodsh && skip "remote MDS with nodsh" && return
+	[ "$OSTCOUNT" -lt "2" ] && skip_env "too few OSTs" && return
+	remote_mds_nodsh && skip "remote MDS with nodsh" && return
+	local index
+	local list=$(comma_list $(mdts_nodes))
 
 #define OBD_FAIL_MDS_OSC_PRECREATE      0x139
-        do_facet $SINGLEMDS lctl set_param fail_loc=0x139
-        test_mkdir -p $DIR/$tdir
-        createmany -o $DIR/$tdir/t- 1000
-        do_facet $SINGLEMDS lctl set_param fail_loc=0
+	do_nodes $list $LCTL set_param fail_loc=0x139
+	test_mkdir -p $DIR/$tdir
+	rm -rf $DIR/$tdir/*
+	createmany -o $DIR/$tdir/t- 1000
+	do_nodes $list $LCTL set_param fail_loc=0
 
-        TLOG=$DIR/$tfile.getstripe
-        $GETSTRIPE $DIR/$tdir > $TLOG
-        OBJS=`awk -vobj=0 '($1 == 0) { obj += 1 } END { print obj;}' $TLOG`
-        unlinkmany $DIR/$tdir/t- 1000
-        [ $OBJS -gt 0 ] && \
-                error "$OBJS objects created on OST-0.  See $TLOG" || pass
+	TLOG=$DIR/$tfile.getstripe
+	$GETSTRIPE $DIR/$tdir > $TLOG
+	OBJS=`awk -vobj=0 '($1 == 0) { obj += 1 } END { print obj;}' $TLOG`
+	unlinkmany $DIR/$tdir/t- 1000
+	[ $OBJS -gt 0 ] && \
+		error "$OBJS objects created on OST-0.  See $TLOG" || pass
 }
 run_test 27u "skip object creation on OSC w/o objects =========="
 
@@ -1633,6 +1686,19 @@ test_27y() {
 			do_facet $SINGLEMDS lctl --device %$OSC activate
 		fi
 	done
+
+	# all osp devices get activated, hence -1 stripe count restored
+	local stripecnt=0
+
+	# sleep 2*lod_qos_maxage seconds waiting for lod qos to notice osp
+	# devices get activated.
+	sleep_maxage
+	$SETSTRIPE -c -1 $DIR/$tfile
+	stripecnt=$($GETSTRIPE -c $DIR/$tfile)
+	rm -f $DIR/$tfile
+	[ $stripecnt -ne $OSTCOUNT ] &&
+		error "Of $OSTCOUNT OSTs, only $stripecnt is available"
+	return 0
 }
 run_test 27y "create files while OST0 is degraded and the rest inactive"
 
@@ -1666,8 +1732,9 @@ check_seq_oid()
                 [ "$obdidx" = "obdidx" ] && have_obdidx=true && continue
                 $have_obdidx || continue
 
-                local ost=$((obdidx + 1))
-                local dev=$(ostdevname $ost)
+		local ost=$((obdidx + 1))
+		local dev=$(ostdevname $ost)
+		local oid_hex
 
 		if [ $(facet_fstype ost$ost) != ldiskfs ]; then
 			echo "Currently only works with ldiskfs-based OSTs"
@@ -1677,24 +1744,38 @@ check_seq_oid()
                 log "want: stripe:$stripe_nr ost:$obdidx oid:$oid/$hex seq:$seq"
 
                 #don't unmount/remount the OSTs if we don't need to do that
-                #local dir=$(facet_mntpt ost$ost)
-                #stop ost$dev
-                #do_facet ost$dev mount -t $FSTYPE $dev $dir $OST_MOUNT_OPTS ||
-                #       { error "mounting $dev as $FSTYPE failed"; return 3; }
-                #local obj_file=$(do_facet ost$ost find $dir/O/$seq -name $oid)
-                #local ff=$(do_facet ost$ost $LL_DECODE_FILTER_FID $obj_file)
+		# LU-2577 changes filter_fid to be smaller, so debugfs needs
+		# update too, until that use mount/ll_decode_filter_fid/mount
+		local dir=$(facet_mntpt ost$ost)
+		local opts=${OST_MOUNT_OPTS}
 
-                local obj_file="O/$seq/d$((oid %32))/$oid"
-                local ff=$(do_facet ost$ost "$DEBUGFS -c -R 'stat $obj_file' \
-                           $dev 2>/dev/null" | grep "parent=")
+		if !  do_facet ost$ost test -b ${dev}; then
+			opts=$(csa_add "$opts" -o loop)
+		fi
+
+		stop ost$ost
+		do_facet ost$ost mount -t $(facet_fstype ost$ost) $opts $dev $dir ||
+			{ error "mounting $dev as $FSTYPE failed"; return 3; }
+
+		seq=$(echo $seq | sed -e "s/^0x//g")
+		if [ $seq == 0 ]; then
+			oid_hex=$(echo $oid)
+		else
+			oid_hex=$(echo $hex | sed -e "s/^0x//g")
+		fi
+		local obj_file=$(do_facet ost$ost find $dir/O/$seq -name $oid_hex)
+		local ff=$(do_facet ost$ost $LL_DECODE_FILTER_FID $obj_file)
+		do_facet ost$ost umount -d $dir
+		start ost$ost $dev $OST_MOUNT_OPTS
+
+		# re-enable when debugfs will understand new filter_fid
+		#local ff=$(do_facet ost$ost "$DEBUGFS -c -R 'stat $obj_file' \
+                #           $dev 2>/dev/null" | grep "parent=")
 
                 [ -z "$ff" ] && error "$obj_file: no filter_fid info"
 
                 echo "$ff" | sed -e 's#.*objid=#got: objid=#'
 
-                #do_facet ost$ost umount -d $dir
-                #start ost$ost $dev $OST_MOUNT_OPTS
-
                 # /mnt/O/0/d23/23: objid=23 seq=0 parent=[0x200000400:0x1e:0x1]
                 # fid: objid=23 seq=0 parent=[0x200000400:0x1e:0x0] stripe=1
                 local ff_parent=$(echo $ff|sed -e 's/.*parent=.//')
@@ -1758,6 +1839,67 @@ test_27A() { # b=19102
 }
 run_test 27A "check filesystem-wide default LOV EA values"
 
+test_27B() { # LU-2523
+	test_mkdir -p $DIR/$tdir
+	rm -f $DIR/$tdir/f0 $DIR/$tdir/f1
+	touch $DIR/$tdir/f0
+	# open f1 with O_LOV_DELAY_CREATE
+	# rename f0 onto f1
+	# call setstripe ioctl on open file descriptor for f1
+	# close
+	multiop $DIR/$tdir/f1 oO_RDWR:O_CREAT:O_LOV_DELAY_CREATE:nB1c \
+		$DIR/$tdir/f0
+
+	rm -f $DIR/$tdir/f1
+	# open f1 with O_LOV_DELAY_CREATE
+	# unlink f1
+	# call setstripe ioctl on open file descriptor for f1
+	# close
+	multiop $DIR/$tdir/f1 oO_RDWR:O_CREAT:O_LOV_DELAY_CREATE:uB1c
+
+	# Allow multiop to fail in imitation of NFS's busted semantics.
+	true
+}
+run_test 27B "call setstripe on open unlinked file/rename victim"
+
+test_27C() { #LU-2871
+	[ $OSTCOUNT -lt 2 ] && skip "needs >= 2 OSTs" && return
+
+	declare -a ost_idx
+	local index
+	local found
+	local i
+	local j
+
+	test_mkdir -p $DIR/$tdir
+	cd $DIR/$tdir
+	for i in $(seq 0 $((OSTCOUNT - 1))); do
+		# set stripe across all OSTs starting from OST$i
+		$SETSTRIPE -i $i -c -1 $tfile$i
+		# get striping information
+		ost_idx=($($GETSTRIPE $tfile$i |
+		         tail -n $((OSTCOUNT + 1)) | awk '{print $1}'))
+		echo ${ost_idx[@]}
+
+		# check the layout
+		[ ${#ost_idx[@]} -eq $OSTCOUNT ] ||
+			error "${#ost_idx[@]} != $OSTCOUNT"
+
+		for index in $(seq 0 $((OSTCOUNT - 1))); do
+			found=0
+			for j in $(echo ${ost_idx[@]}); do
+				if [ $index -eq $j ]; then
+					found=1
+					break
+				fi
+			done
+			[ $found = 1 ] ||
+				error "Can not find $index in ${ost_idx[@]}"
+		done
+	done
+}
+run_test 27C "check full striping across all OSTs"
+
 # createtest also checks that device nodes are created and
 # then visible correctly (#2091)
 test_28() { # bug 2091
@@ -1991,6 +2133,22 @@ test_31m() {
 }
 run_test 31m "link to file: the same, non-existing, dir==============="
 
+test_31n() {
+	[ -e /proc/self/fd/173 ] && echo "skipping, fd 173 is in use" && return
+	touch $DIR/$tfile || error "cannot create '$DIR/$tfile'"
+	nlink=$(stat --format=%h $DIR/$tfile)
+	[ ${nlink:--1} -eq 1 ] || error "nlink is $nlink, expected 1"
+	exec 173<$DIR/$tfile
+	trap "exec 173<&-" EXIT
+	nlink=$(stat --dereference --format=%h /proc/self/fd/173)
+	[ ${nlink:--1} -eq 1 ] || error "nlink is $nlink, expected 1"
+	rm $DIR/$tfile || error "cannot remove '$DIR/$tfile'"
+	nlink=$(stat --dereference --format=%h /proc/self/fd/173)
+	[ ${nlink:--1} -eq 0 ] || error "nlink is $nlink, expected 0"
+	exec 173<&-
+}
+run_test 31n "check link count of unlinked file"
+
 cleanup_test32_mount() {
 	trap 0
 	$UMOUNT $DIR/$tdir/ext2-mountpoint
@@ -2274,7 +2432,7 @@ test_33c() {
         for ostnum in $(seq $OSTCOUNT); do
                 # test-framework's OST numbering is one-based, while Lustre's
                 # is zero-based
-                ostname=$(printf "$FSNAME-OST%.4d" $((ostnum - 1)))
+                ostname=$(printf "$FSNAME-OST%.4x" $((ostnum - 1)))
                 # Parsing llobdstat's output sucks; we could grep the /proc
                 # path, but that's likely to not be as portable as using the
                 # llobdstat utility.  So we parse lctl output instead.
@@ -2298,7 +2456,7 @@ test_33c() {
 
         # Total up write_bytes after writing.  We'd better find non-zeros.
         for ostnum in $(seq $OSTCOUNT); do
-                ostname=$(printf "$FSNAME-OST%.4d" $((ostnum - 1)))
+                ostname=$(printf "$FSNAME-OST%.4x" $((ostnum - 1)))
                 write_bytes=$(do_facet ost$ostnum lctl get_param -n \
                         obdfilter/$ostname/stats |
                         awk '/^write_bytes/ {print $7}' )
@@ -2313,7 +2471,7 @@ test_33c() {
         if $all_zeros
         then
                 for ostnum in $(seq $OSTCOUNT); do
-                        ostname=$(printf "$FSNAME-OST%.4d" $((ostnum - 1)))
+                        ostname=$(printf "$FSNAME-OST%.4x" $((ostnum - 1)))
                         echo "Check that write_bytes is present in obdfilter/*/stats:"
                         do_facet ost$ostnum lctl get_param -n \
                                 obdfilter/$ostname/stats
@@ -2435,6 +2593,8 @@ test_34h() {
 	local sz=1000
 
 	dd if=/dev/zero of=$DIR/$tfile bs=1M count=10 || error
+	sync # Flush the cache so that multiop below does not block on cache
+	     # flush when getting the group lock
 	$MULTIOP $DIR/$tfile OG${gid}T${sz}g${gid}c &
 	MULTIPID=$!
 	sleep 2
@@ -3473,7 +3633,7 @@ run_test 50 "special situations: /proc symlinks  ==============="
 
 test_51a() {	# was test_51
 	# bug 1516 - create an empty entry right after ".." then split dir
-	test_mkdir $DIR/$tdir
+	test_mkdir -p $DIR/$tdir
 	touch $DIR/$tdir/foo
 	$MCREATE $DIR/$tdir/bar
 	rm $DIR/$tdir/foo
@@ -3494,6 +3654,9 @@ test_51b() {
 	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	local BASE=$DIR/$tdir
 
+	# cleanup the directory
+	rm -fr $BASE
+
 	test_mkdir -p $BASE
 
 	local mdtidx=$(printf "%04x" $($LFS getstripe -M $BASE))
@@ -3637,24 +3800,47 @@ test_53() {
 	remote_ost_nodsh && skip "remote OST with nodsh" && return
 
 	local param
+	local param_seq
 	local ostname
 	local mds_last
+	local mds_last_seq
 	local ost_last
+	local ost_last_seq
+	local ost_last_id
 	local ostnum
+	local node
+	local found=0
 
 	# only test MDT0000
         local mdtosc=$(get_mdtosc_proc_path $SINGLEMDS)
         for value in $(do_facet $SINGLEMDS lctl get_param osc.$mdtosc.prealloc_last_id) ; do
-                param=`echo ${value[0]} | cut -d "=" -f1`
-                ostname=`echo $param | cut -d "." -f2 | cut -d - -f 1-2`
-                mds_last=$(do_facet $SINGLEMDS lctl get_param -n $param)
-                ostnum=$(echo $ostname | sed "s/${FSNAME}-OST//g" | awk '{print ($1+1)}' )
-                ost_last=$(do_facet ost$ostnum lctl get_param -n obdfilter.$ostname.last_id | head -n 1)
-                echo "$ostname.last_id=$ost_last ; MDS.last_id=$mds_last"
-                if [ $ost_last != $mds_last ]; then
-                    error "$ostname.last_id=$ost_last ; MDS.last_id=$mds_last"
-                fi
+                param=$(echo ${value[0]} | cut -d "=" -f1)
+                ostname=$(echo $param | cut -d "." -f2 | cut -d - -f 1-2)
+                param_seq=$(echo ${param} |
+			    sed -e s/prealloc_last_id/prealloc_last_seq/g)
+		mds_last_seq=$(do_facet $SINGLEMDS lctl get_param -n $param_seq)
+		mds_last=$(do_facet $SINGLEMDS lctl get_param -n $param)
+
+		ostnum=$(index_from_ostuuid ${ostname}_UUID)
+		node=$(facet_active_host ost$((ostnum+1)))
+		param="obdfilter.$ostname.last_id"
+		for ost_last in $(do_node $node lctl get_param -n $param) ; do
+			echo "$ostname.last_id=$ost_last ;MDS.last_id=$mds_last"
+			ost_last_id=$(echo $ost_last | awk -F':' '{print $2}' |
+				      sed -e "s/^0x//g")
+			ost_last_seq=$(echo $ost_last | awk -F':' '{print $1}')
+			if [ $ost_last_seq = $mds_last_seq ]; then
+				if [ $ost_last_id != $mds_last ]; then
+					error "$ost_last != $mds_last_id"
+				else
+					found=1
+					break
+				fi
+			fi
+		done
         done
+	[ $found = 0 ] && error "can not match last_seq/last_id for $mdtosc"
+	return 0
 }
 run_test 53 "verify that MDS and OSTs agree on pre-creation ===="
 
@@ -4172,11 +4358,13 @@ test_56u() { # LU-611
 	[ $NUMS -eq $EXPECTED ] ||
 		error "\"$CMD\" wrong: found $NUMS, expected $EXPECTED"
 
-	EXPECTED=$(((NUMDIRS + 1) * NUMFILES + ONESTRIPE))
-	CMD="$LFIND -stripe-index 0,1 -type f $TDIR"
-	NUMS=$($CMD | wc -l)
-	[ $NUMS -eq $EXPECTED ] ||
-		error "\"$CMD\" wrong: found $NUMS, expected $EXPECTED"
+	if [ $OSTCOUNT -gt 1 ]; then
+		EXPECTED=$(((NUMDIRS + 1) * NUMFILES + ONESTRIPE))
+		CMD="$LFIND -stripe-index 0,1 -type f $TDIR"
+		NUMS=$($CMD | wc -l)
+		[ $NUMS -eq $EXPECTED ] ||
+			error "\"$CMD\" wrong: found $NUMS, expected $EXPECTED"
+	fi
 }
 run_test 56u "check lfs find -stripe-index works"
 
@@ -4297,6 +4485,29 @@ test_56w() {
 }
 run_test 56w "check lfs_migrate -c stripe_count works"
 
+test_56x() {
+	check_swap_layouts_support && return 0
+	[ "$OSTCOUNT" -lt "2" ] &&
+		skip_env "need 2 OST, skipping test" && return
+
+	local dir0=$DIR/$tdir/$testnum
+	mkdir -p $dir0 || error "creating dir $dir0"
+
+	local ref1=/etc/passwd
+	local file1=$dir0/file1
+
+	$SETSTRIPE -c 2 $file1
+	cp $ref1 $file1
+	$LFS migrate -c 1 $file1 || error "migrate failed rc = $?"
+	stripe=$($GETSTRIPE -c $file1)
+	[[ $stripe == 1 ]] || error "stripe of $file1 is $stripe != 1"
+	cmp $file1 $ref1 || error "content mismatch $file1 differs from $ref1"
+
+	# clean up
+	rm -f $file1
+}
+run_test 56x "lfs migration support"
+
 test_57a() {
 	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	# note test will not do anything if MDS is not local
@@ -5483,7 +5694,9 @@ function get_named_value()
     done
 }
 
-export CACHE_MAX=`$LCTL get_param -n llite.*.max_cached_mb | head -n 1`
+export CACHE_MAX=$($LCTL get_param -n llite.*.max_cached_mb |
+		   awk '/^max_cached_mb/ { print $2 }')
+
 cleanup_101a() {
 	$LCTL set_param -n llite.*.max_cached_mb $CACHE_MAX
 	trap 0
@@ -5494,7 +5707,6 @@ test_101a() {
 	local s
 	local discard
 	local nreads=10000
-	[ "$CPU" = "UML" ] && nreads=1000
 	local cache_limit=32
 
 	$LCTL set_param -n osc.*-osc*.rpc_stats 0
@@ -5531,8 +5743,8 @@ setup_test101bc() {
 	STRIPE_OFFSET=0
 
 	local list=$(comma_list $(osts_nodes))
-	do_nodes $list $LCTL set_param -n obdfilter.*.read_cache_enable=0
-	do_nodes $list $LCTL set_param -n obdfilter.*.writethrough_cache_enable=0
+	set_osd_param $list '' read_cache_enable 0
+	set_osd_param $list '' writethrough_cache_enable 0
 
 	trap cleanup_test101bc EXIT
 	# prepare the read-ahead file
@@ -5547,8 +5759,8 @@ cleanup_test101bc() {
 	rm -f $DIR/$tfile
 
 	local list=$(comma_list $(osts_nodes))
-	do_nodes $list $LCTL set_param -n obdfilter.*.read_cache_enable=1
-	do_nodes $list $LCTL set_param -n obdfilter.*.writethrough_cache_enable=1
+	set_osd_param $list '' read_cache_enable 1
+	set_osd_param $list '' writethrough_cache_enable 1
 }
 
 calc_total() {
@@ -6055,7 +6267,7 @@ test_102k() {
         local default_size=`$GETSTRIPE -S $test_kdir`
         local default_count=`$GETSTRIPE -c $test_kdir`
         local default_offset=`$GETSTRIPE -i $test_kdir`
-        $SETSTRIPE -S 65536 -i 1 -c $OSTCOUNT $test_kdir ||
+	$SETSTRIPE -S 65536 -i 0 -c $OSTCOUNT $test_kdir ||
                 error 'dir setstripe failed'
         setfattr -n trusted.lov $test_kdir
         local stripe_size=`$GETSTRIPE -S $test_kdir`
@@ -6129,11 +6341,15 @@ test_103 () {
     run_acl_subtest inheritance || error "inheritance test failed"
     rm -f make-tree
 
-    echo "LU-974 ignore umask when acl is enabled..."
-    mkdir $DIR/974
-    cd $DIR/974
-    run_acl_subtest 974 || error "LU-974 test failed"
-    rm -rf $DIR/974
+	echo "LU-974 ignore umask when acl is enabled..."
+	run_acl_subtest 974 || error "LU-974 test failed"
+	if [ $MDSCOUNT -ge 2 ]; then
+		run_acl_subtest 974_remote ||
+			error "LU-974 test failed under remote dir"
+	fi
+
+    echo "LU-2561 newly created file is same size as directory..."
+    run_acl_subtest 2561 || error "LU-2561 test failed"
 
     cd $SAVE_PWD
     umask $SAVE_UMASK
@@ -6452,6 +6668,7 @@ test_117() # bug 10891
 }
 run_test 117 "verify fsfilt_extend =========="
 
+NO_SLOW_RESENDCOUNT=4
 export OLD_RESENDCOUNT=""
 set_resend_count () {
 	local PROC_RESENDCOUNT="osc.${FSNAME}-OST*-osc-*.resend_count"
@@ -6460,7 +6677,8 @@ set_resend_count () {
 	echo resend_count is set to $(lctl get_param -n $PROC_RESENDCOUNT)
 }
 
-[ "$SLOW" = "no" ] && set_resend_count 4 # for reduce test_118* time (bug 14842)
+# for reduce test_118* time (b=14842)
+[ "$SLOW" = "no" ] && set_resend_count $NO_SLOW_RESENDCOUNT
 
 # Reset async IO behavior after error case
 reset_async() {
@@ -6530,6 +6748,10 @@ run_test 118b "Reclaim dirty pages on fatal error =========="
 test_118c()
 {
 	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
+
+	# for 118c, restore the original resend count, LU-1940
+	[ "$SLOW" = "no" ] && [ -n "$OLD_RESENDCOUNT" ] &&
+				set_resend_count $OLD_RESENDCOUNT
 	remote_ost_nodsh && skip "remote OST with nodsh" && return
 
 	reset_async
@@ -6572,6 +6794,9 @@ test_118c()
 }
 run_test 118c "Fsync blocks on EROFS until dirty pages are flushed =========="
 
+# continue to use small resend count to reduce test_118* time (b=14842)
+[ "$SLOW" = "no" ] && set_resend_count $NO_SLOW_RESENDCOUNT
+
 test_118d()
 {
 	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
@@ -6832,6 +7057,15 @@ test_118l()
 }
 run_test 118l "fsync dir ========="
 
+test_118m() # LU-3066
+{
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
+	test_mkdir -p $DIR/$tdir
+	$MULTIOP $DIR/$tdir DY || error "fdatasync dir failed"
+	rm -rf $DIR/$tdir
+}
+run_test 118m "fdatasync dir ========="
+
 [ "$SLOW" = "no" ] && [ -n "$OLD_RESENDCOUNT" ] && set_resend_count $OLD_RESENDCOUNT
 
 test_119a() # bug 11737
@@ -6903,9 +7137,13 @@ test_120a() {
         test_mkdir -p $DIR/$tdir
         [ -z "`lctl get_param -n mdc.*.connect_flags | grep early_lock_cancel`" ] && \
                skip "no early lock cancel on server" && return 0
-        lru_resize_disable mdc
-        lru_resize_disable osc
-        cancel_lru_locks mdc
+
+	lru_resize_disable mdc
+	lru_resize_disable osc
+	cancel_lru_locks mdc
+	# asynchronous object destroy at MDT could cause bl ast to client
+	cancel_lru_locks osc
+
         stat $DIR/$tdir > /dev/null
         can1=`lctl get_param -n ldlm.services.ldlm_canceld.stats | awk '/ldlm_cancel/ {print $2}'`
         blk1=`lctl get_param -n ldlm.services.ldlm_cbd.stats | awk '/ldlm_bl_callback/ {print $2}'`
@@ -7596,6 +7834,9 @@ test_130b() {
 	[ "$OSTCOUNT" -lt "2" ] &&
 		skip_env "skipping FIEMAP on 2-stripe file test" && return
 
+	[ "$OSTCOUNT" -ge "10" ] &&
+		skip_env "skipping FIEMAP with >= 10 OSTs" && return
+
 	local filefrag_op=$(filefrag -e 2>&1 | grep "invalid option")
 	[ -n "$filefrag_op" ] && skip_env "filefrag does not support FIEMAP" &&
 		return
@@ -7652,6 +7893,9 @@ test_130c() {
 	[ "$OSTCOUNT" -lt "2" ] &&
 		skip_env "skipping FIEMAP on 2-stripe file" && return
 
+	[ "$OSTCOUNT" -ge "10" ] &&
+		skip_env "skipping FIEMAP with >= 10 OSTs" && return
+
 	filefrag_op=$(filefrag -e 2>&1 | grep "invalid option")
 	[ -n "$filefrag_op" ] && skip "filefrag does not support FIEMAP" &&
 		return
@@ -7711,6 +7955,9 @@ run_test 130c "FIEMAP (2-stripe file with hole)"
 test_130d() {
 	[ "$OSTCOUNT" -lt "3" ] && skip_env "skipping FIEMAP on N-stripe file test" && return
 
+	[ "$OSTCOUNT" -ge "10" ] &&
+		skip_env "skipping FIEMAP with >= 10 OSTs" && return
+
 	filefrag_op=$(filefrag -e 2>&1 | grep "invalid option")
 	[ -n "$filefrag_op" ] && skip "filefrag does not support FIEMAP" && return
 
@@ -7762,6 +8009,9 @@ run_test 130d "FIEMAP (N-stripe file)"
 test_130e() {
 	[ "$OSTCOUNT" -lt "2" ] && skip_env "skipping continuation FIEMAP test" && return
 
+	[ "$OSTCOUNT" -ge "10" ] &&
+		skip_env "skipping FIEMAP with >= 10 OSTs" && return
+
 	filefrag_op=$(filefrag -e 2>&1 | grep "invalid option")
 	[ -n "$filefrag_op" ] && skip "filefrag does not support FIEMAP" && return
 
@@ -7867,7 +8117,7 @@ get_ost_param() {
                 [ x$gl = x"" ] && gl=0
                 gl_sum=$((gl_sum + gl))
         done
-        echo $gl
+        echo $gl_sum
 }
 
 som_mode_switch() {
@@ -8113,20 +8363,20 @@ get_rename_size() {
 
 test_133d() {
 	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
-    remote_ost_nodsh && skip "remote OST with nodsh" && return
-    remote_mds_nodsh && skip "remote MDS with nodsh" && return
-    do_facet $SINGLEMDS $LCTL list_param mdt.*.rename_stats ||
-        { skip "MDS doesn't support rename stats"; return; }
+	remote_ost_nodsh && skip "remote OST with nodsh" && return
+	remote_mds_nodsh && skip "remote MDS with nodsh" && return
+	do_facet $SINGLEMDS $LCTL list_param mdt.*.rename_stats ||
+	{ skip "MDS doesn't support rename stats"; return; }
 
-    local testdir1=$DIR/${tdir}/stats_testdir1
-    local testdir2=$DIR/${tdir}/stats_testdir2
+	local testdir1=$DIR/${tdir}/stats_testdir1
+	local testdir2=$DIR/${tdir}/stats_testdir2
 
-    do_facet $SINGLEMDS $LCTL set_param mdt.*.rename_stats=clear
+	do_facet $SINGLEMDS $LCTL set_param mdt.*.rename_stats=clear
 
-    test_mkdir -p ${testdir1} || error "mkdir failed"
-    test_mkdir -p ${testdir2} || error "mkdir failed"
+	mkdir -p ${testdir1} || error "mkdir failed"
+	mkdir -p ${testdir2} || error "mkdir failed"
 
-    createmany -o $testdir1/test 512 || error "createmany failed"
+	createmany -o $testdir1/test 512 || error "createmany failed"
 
 	# check samedir rename size
 	mv ${testdir1}/test0 ${testdir1}/test_0
@@ -8145,18 +8395,18 @@ test_133d() {
 	echo "source rename dir size: ${testdir1_size}"
 	echo "target rename dir size: ${testdir2_size}"
 
-    local cmd="do_facet $SINGLEMDS $LCTL get_param mdt.*.rename_stats"
-    eval $cmd || error "$cmd failed"
-    local samedir=$($cmd | grep 'same_dir')
-    local same_sample=$(get_rename_size $testdir1_size)
-    [ -z "$samedir" ] && error "samedir_rename_size count error"
-    [ "$same_sample" -eq 1 ] || error "samedir_rename_size error $same_sample"
-    echo "Check same dir rename stats success"
+	local cmd="do_facet $SINGLEMDS $LCTL get_param mdt.*.rename_stats"
+	eval $cmd || error "$cmd failed"
+	local samedir=$($cmd | grep 'same_dir')
+	local same_sample=$(get_rename_size $testdir1_size)
+	[ -z "$samedir" ] && error "samedir_rename_size count error"
+	[ "$same_sample" -eq 1 ] || error "samedir_rename_size error $same_sample"
+	echo "Check same dir rename stats success"
 
-    do_facet $SINGLEMDS $LCTL set_param mdt.*.rename_stats=clear
+	do_facet $SINGLEMDS $LCTL set_param mdt.*.rename_stats=clear
 
-    # check crossdir rename size
-    mv ${testdir1}/test_0 ${testdir2}/test_0
+	# check crossdir rename size
+	mv ${testdir1}/test_0 ${testdir2}/test_0
 
 	testdir1_size=$(ls -l $DIR/${tdir} |
 		awk '/stats_testdir1/ {print $5}')
@@ -8172,15 +8422,15 @@ test_133d() {
 	echo "source rename dir size: ${testdir1_size}"
 	echo "target rename dir size: ${testdir2_size}"
 
-    eval $cmd || error "$cmd failed"
-    local crossdir=$($cmd | grep 'crossdir')
-    local src_sample=$(get_rename_size $testdir1_size crossdir_src)
-    local tgt_sample=$(get_rename_size $testdir2_size crossdir_tgt)
-    [ -z "$crossdir" ] && error "crossdir_rename_size count error"
-    [ "$src_sample" -eq 1 ] || error "crossdir_rename_size error $src_sample"
-    [ "$tgt_sample" -eq 1 ] || error "crossdir_rename_size error $tgt_sample"
-    echo "Check cross dir rename stats success"
-    rm -rf $DIR/${tdir}
+	eval $cmd || error "$cmd failed"
+	local crossdir=$($cmd | grep 'crossdir')
+	local src_sample=$(get_rename_size $testdir1_size crossdir_src)
+	local tgt_sample=$(get_rename_size $testdir2_size crossdir_tgt)
+	[ -z "$crossdir" ] && error "crossdir_rename_size count error"
+	[ "$src_sample" -eq 1 ] || error "crossdir_rename_size error $src_sample"
+	[ "$tgt_sample" -eq 1 ] || error "crossdir_rename_size error $tgt_sample"
+	echo "Check cross dir rename stats success"
+	rm -rf $DIR/${tdir}
 }
 run_test 133d "Verifying rename_stats ========================================"
 
@@ -8230,6 +8480,36 @@ test_133e() {
 }
 run_test 133e "Verifying OST {read,write}_bytes nid stats ================="
 
+test_133f() {
+	local proc_dirs="/proc/fs/lustre/ /proc/sys/lnet/ /proc/sys/lustre/"
+	local facet
+
+	# First without trusting modes.
+	find $proc_dirs \
+		-exec cat '{}' \; &> /dev/null
+
+	# Second verifying readability.
+	find $proc_dirs \
+		-type f \
+		-readable \
+		-exec cat '{}' \; > /dev/null ||
+			error "proc file read failed"
+
+	for facet in $SINGLEMDS ost1; do
+		do_facet $facet find $proc_dirs \
+			-not -name req_history \
+			-exec cat '{}' \\\; &> /dev/null
+
+	    do_facet $facet	find $proc_dirs \
+			-not -name req_history \
+			-type f \
+			-readable \
+			-exec cat '{}' \\\; > /dev/null ||
+				error "proc file read failed"
+	done
+}
+run_test 133f "Check for LBUGs/Oopses/unreadable files in /proc"
+
 test_140() { #bug-17379
 	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
         test_mkdir -p $DIR/$tdir || error "Creating dir $DIR/$tdir"
@@ -8303,8 +8583,9 @@ run_test 150 "truncate/append tests"
 
 function roc_hit() {
 	local list=$(comma_list $(osts_nodes))
-
-	echo $(get_obdfilter_param $list '' stats |
+	#debug temp debug for LU-2902: lets see what values we get back
+	echo $(get_osd_param $list '' stats) 1>&2
+	echo $(get_osd_param $list '' stats |
 	       awk '/'cache_hit'/ {sum+=$2} END {print sum}')
 }
 
@@ -8315,7 +8596,7 @@ function set_cache() {
 		on=0;
 	fi
 	local list=$(comma_list $(osts_nodes))
-	set_obdfilter_param $list '' $1_cache_enable $on
+	set_osd_param $list '' $1_cache_enable $on
 
 	cancel_lru_locks osc
 }
@@ -8328,32 +8609,46 @@ test_151() {
 	local list=$(comma_list $(osts_nodes))
 
 	# check whether obdfilter is cache capable at all
-	if ! get_obdfilter_param $list '' read_cache_enable >/dev/null; then
+	if ! get_osd_param $list '' read_cache_enable >/dev/null; then
 		echo "not cache-capable obdfilter"
 		return 0
 	fi
 
 	# check cache is enabled on all obdfilters
-	if get_obdfilter_param $list '' read_cache_enable | grep 0; then
+	if get_osd_param $list '' read_cache_enable | grep 0; then
 		echo "oss cache is disabled"
 		return 0
 	fi
 
-	set_obdfilter_param $list '' writethrough_cache_enable 1
+	set_osd_param $list '' writethrough_cache_enable 1
 
-        # pages should be in the case right after write
-        dd if=/dev/urandom of=$DIR/$tfile bs=4k count=$CPAGES || error "dd failed"
-        local BEFORE=`roc_hit`
-        cancel_lru_locks osc
-        cat $DIR/$tfile >/dev/null
-        local AFTER=`roc_hit`
-        if ! let "AFTER - BEFORE == CPAGES"; then
-                error "NOT IN CACHE: before: $BEFORE, after: $AFTER"
-        fi
+	# check write cache is enabled on all obdfilters
+	if get_osd_param $list '' writethrough_cache_enable | grep 0; then
+		echo "oss write cache is NOT enabled"
+		return 0
+	fi
+
+#define OBD_FAIL_OBD_NO_LRU  0x609
+	do_nodes $list $LCTL set_param fail_loc=0x609
+
+	# pages should be in the case right after write
+	dd if=/dev/urandom of=$DIR/$tfile bs=4k count=$CPAGES ||
+		error "dd failed"
+
+	local BEFORE=`roc_hit`
+	cancel_lru_locks osc
+	cat $DIR/$tfile >/dev/null
+	local AFTER=`roc_hit`
+
+	do_nodes $list $LCTL set_param fail_loc=0
+
+	if ! let "AFTER - BEFORE == CPAGES"; then
+		error "NOT IN CACHE: before: $BEFORE, after: $AFTER"
+	fi
 
         # the following read invalidates the cache
         cancel_lru_locks osc
-	set_obdfilter_param $list '' read_cache_enable 0
+	set_osd_param $list '' read_cache_enable 0
         cat $DIR/$tfile >/dev/null
 
         # now data shouldn't be found in the cache
@@ -8365,7 +8660,7 @@ test_151() {
                 error "IN CACHE: before: $BEFORE, after: $AFTER"
         fi
 
-	set_obdfilter_param $list '' read_cache_enable 1
+	set_osd_param $list '' read_cache_enable 1
         rm -f $DIR/$tfile
 }
 run_test 151 "test cache on oss and controls ==============================="
@@ -8399,18 +8694,10 @@ test_153() {
 }
 run_test 153 "test if fdatasync does not crash ======================="
 
-test_154() {
-	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
-	[[ $(lustre_version_code $SINGLEMDS) -ge $(version_code 2.2.51) ]] ||
-		{ skip "Need MDS version at least 2.2.51"; return 0; }
-
-	cp /etc/hosts $DIR/$tfile
-
-	fid=$($LFS path2fid $DIR/$tfile)
-	rc=$?
-	[ $rc -ne 0 ] && error "error: could not get fid for $DIR/$tfile."
-
-	ffid=$DIR/.lustre/fid/$fid
+dot_lustre_fid_permission_check() {
+	local fid=$1
+	local ffid=$MOUNT/.lustre/fid/$fid
+	local test_dir=$2
 
 	echo "stat fid $fid"
 	stat $ffid > /dev/null || error "stat $ffid failed."
@@ -8423,14 +8710,16 @@ test_154() {
 	echo "append write to fid $fid"
 	cat /etc/hosts >> $ffid || error "append write $ffid failed."
 	echo "rename fid $fid"
-	mv $ffid $DIR/$tfile.1 && error "rename $ffid to $tfile.1 should fail."
-	touch $DIR/$tfile.1
-	mv $DIR/$tfile.1 $ffid && error "rename $tfile.1 to $ffid should fail."
-	rm -f $DIR/$tfile.1
+	mv $ffid $test_dir/$tfile.1 &&
+		error "rename $ffid to $tfile.1 should fail."
+	touch $test_dir/$tfile.1
+	mv $test_dir/$tfile.1 $ffid &&
+		error "rename $tfile.1 to $ffid should fail."
+	rm -f $test_dir/$tfile.1
 	echo "truncate fid $fid"
 	$TRUNCATE $ffid 777 || error "truncate $ffid failed."
 	echo "link fid $fid"
-	ln -f $ffid $DIR/tfile.lnk || error "link $ffid failed."
+	ln -f $ffid $test_dir/tfile.lnk || error "link $ffid failed."
 	if [ -n $(lctl get_param -n mdc.*-mdc-*.connect_flags | grep acl) ]; then
 		echo "setfacl fid $fid"
 		setfacl -R -m u:bin:rwx $ffid || error "setfacl $ffid failed."
@@ -8438,80 +8727,147 @@ test_154() {
 		getfacl $ffid >/dev/null || error "getfacl $ffid failed."
 	fi
 	echo "unlink fid $fid"
-	unlink $DIR/.lustre/fid/$fid && error "unlink $ffid should fail."
+	unlink $MOUNT/.lustre/fid/$fid && error "unlink $ffid should fail."
 	echo "mknod fid $fid"
 	mknod $ffid c 1 3 && error "mknod $ffid should fail."
 
 	fid=[0xf00000400:0x1:0x0]
-	ffid=$DIR/.lustre/fid/$fid
+	ffid=$MOUNT/.lustre/fid/$fid
 
 	echo "stat non-exist fid $fid"
 	stat $ffid > /dev/null && error "stat non-exist $ffid should fail."
 	echo "write to non-exist fid $fid"
 	cat /etc/hosts > $ffid && error "write non-exist $ffid should fail."
 	echo "link new fid $fid"
-	ln $DIR/$tfile $ffid && error "link $ffid should fail."
+	ln $test_dir/$tfile $ffid && error "link $ffid should fail."
 
-	test_mkdir -p $DIR/$tdir
-	touch $DIR/$tdir/$tfile
-	fid=$($LFS path2fid $DIR/$tdir)
+	mkdir -p $test_dir/$tdir
+	touch $test_dir/$tdir/$tfile
+	fid=$($LFS path2fid $test_dir/$tdir)
 	rc=$?
-	[ $rc -ne 0 ] && error "error: could not get fid for $DIR/$tfile."
+	[ $rc -ne 0 ] &&
+		error "error: could not get fid for $test_dir/$dir/$tfile."
 
-	ffid=$DIR/.lustre/fid/$fid
+	ffid=$MOUNT/.lustre/fid/$fid
 
 	echo "ls $fid"
 	ls $ffid > /dev/null || error "ls $ffid failed."
 	echo "touch $fid/$tfile.1"
 	touch $ffid/$tfile.1 || error "touch $ffid/$tfile.1 failed."
 
-	echo "touch $DIR/.lustre/fid/$tfile"
-	touch $DIR/.lustre/fid/$tfile && \
-		error "touch $DIR/.lustre/fid/$tfile should fail."
+	echo "touch $MOUNT/.lustre/fid/$tfile"
+	touch $MOUNT/.lustre/fid/$tfile && \
+		error "touch $MOUNT/.lustre/fid/$tfile should fail."
 
-	echo "setxattr to $DIR/.lustre/fid"
-	setfattr -n trusted.name1 -v value1 $DIR/.lustre/fid &&
-		error "setxattr should fail."
+	echo "setxattr to $MOUNT/.lustre/fid"
+	setfattr -n trusted.name1 -v value1 $MOUNT/.lustre/fid
 
-	echo "listxattr for $DIR/.lustre/fid"
-	getfattr -d -m "^trusted" $DIR/.lustre/fid &&
-		error "listxattr should fail."
+	echo "listxattr for $MOUNT/.lustre/fid"
+	getfattr -d -m "^trusted" $MOUNT/.lustre/fid
 
-	echo "delxattr from $DIR/.lustre/fid"
-	setfattr -x trusted.name1 $DIR/.lustre/fid &&
-		error "delxattr should fail."
+	echo "delxattr from $MOUNT/.lustre/fid"
+	setfattr -x trusted.name1 $MOUNT/.lustre/fid
 
-	echo "touch invalid fid: $DIR/.lustre/fid/[0x200000400:0x2:0x3]"
-	touch $DIR/.lustre/fid/[0x200000400:0x2:0x3] &&
+	echo "touch invalid fid: $MOUNT/.lustre/fid/[0x200000400:0x2:0x3]"
+	touch $MOUNT/.lustre/fid/[0x200000400:0x2:0x3] &&
 		error "touch invalid fid should fail."
 
-	echo "touch non-normal fid: $DIR/.lustre/fid/[0x1:0x2:0x0]"
-	touch $DIR/.lustre/fid/[0x1:0x2:0x0] &&
+	echo "touch non-normal fid: $MOUNT/.lustre/fid/[0x1:0x2:0x0]"
+	touch $MOUNT/.lustre/fid/[0x1:0x2:0x0] &&
 		error "touch non-normal fid should fail."
 
-	echo "rename $tdir to $DIR/.lustre/fid"
-	mrename $DIR/$tdir $DIR/.lustre/fid &&
-		error "rename to $DIR/.lustre/fid should fail."
+	echo "rename $tdir to $MOUNT/.lustre/fid"
+	mrename $test_dir/$tdir $MOUNT/.lustre/fid &&
+		error "rename to $MOUNT/.lustre/fid should fail."
 
 	echo "rename .lustre to itself"
-	fid=$($LFS path2fid $DIR)
-	mrename $DIR/.lustre $DIR/.lustre/fid/$fid/.lustre &&
+	fid=$($LFS path2fid $MOUNT)
+	mrename $MOUNT/.lustre $MOUNT/.lustre/fid/$fid/.lustre &&
 		error "rename .lustre to itself should fail."
 
-	$OPENFILE -f O_LOV_DELAY_CREATE:O_CREAT $DIR/$tfile-2
-	fid=$($LFS path2fid $DIR/$tfile-2)
-	echo "cp /etc/passwd $DIR/.lustre/fid/$fid"
-	cp /etc/passwd $DIR/.lustre/fid/$fid &&
+	local old_obf_mode=$(stat --format="%a" $DIR/.lustre/fid)
+	local new_obf_mode=777
+
+	echo "change mode of $DIR/.lustre/fid to $new_obf_mode"
+	chmod $new_obf_mode $DIR/.lustre/fid ||
+		error "chmod $new_obf_mode $DIR/.lustre/fid failed"
+
+	local obf_mode=$(stat --format=%a $DIR/.lustre/fid)
+	[ $obf_mode -eq $new_obf_mode ] ||
+		error "stat $DIR/.lustre/fid returned wrong mode $obf_mode"
+
+	echo "restore mode of $DIR/.lustre/fid to $old_obf_mode"
+	chmod $old_obf_mode $DIR/.lustre/fid ||
+		error "chmod $old_obf_mode $DIR/.lustre/fid failed"
+
+	$OPENFILE -f O_LOV_DELAY_CREATE:O_CREAT $test_dir/$tfile-2
+	fid=$($LFS path2fid $test_dir/$tfile-2)
+	echo "cp /etc/passwd $MOUNT/.lustre/fid/$fid"
+	cp /etc/passwd $MOUNT/.lustre/fid/$fid &&
 		error "create lov data thru .lustre should fail."
-	echo "cp /etc/passwd $DIR/$tfile-2"
-	cp /etc/passwd $DIR/$tfile-2 || error "copy to $DIR/$tfile-2 failed."
-	echo "diff /etc/passwd $DIR/.lustre/fid/$fid"
-	diff /etc/passwd $DIR/.lustre/fid/$fid ||
-		error "diff /etc/passwd $DIR/.lustre/fid/$fid failed."
+	echo "cp /etc/passwd $test_dir/$tfile-2"
+	cp /etc/passwd $test_dir/$tfile-2 ||
+		error "copy to $test_dir/$tfile-2 failed."
+	echo "diff /etc/passwd $MOUNT/.lustre/fid/$fid"
+	diff /etc/passwd $MOUNT/.lustre/fid/$fid ||
+		error "diff /etc/passwd $MOUNT/.lustre/fid/$fid failed."
 
-	echo "Open-by-FID succeeded"
+	rm -rf $test_dir/tfile.lnk
+	rm -rf $test_dir/$tfile-2
 }
-run_test 154 "Open-by-FID"
+
+test_154a() {
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
+	[[ $(lustre_version_code $SINGLEMDS) -ge $(version_code 2.2.51) ]] ||
+		{ skip "Need MDS version at least 2.2.51"; return 0; }
+
+	cp /etc/hosts $DIR/$tfile
+
+	fid=$($LFS path2fid $DIR/$tfile)
+	rc=$?
+	[ $rc -ne 0 ] && error "error: could not get fid for $DIR/$tfile."
+
+	dot_lustre_fid_permission_check "$fid" $DIR ||
+		error "dot lustre permission check $fid failed"
+
+	rm -rf $MOUNT/.lustre && error ".lustre is not allowed to be unlinked"
+
+	touch $MOUNT/.lustre/file &&
+		error "creation is not allowed under .lustre"
+
+	mkdir $MOUNT/.lustre/dir &&
+		error "mkdir is not allowed under .lustre"
+
+	rm -rf $DIR/$tfile
+}
+run_test 154a "Open-by-FID"
+
+test_154b() {
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
+	[[ $(lustre_version_code $SINGLEMDS) -ge $(version_code 2.2.51) ]] ||
+		{ skip "Need MDS version at least 2.2.51"; return 0; }
+
+	[ $MDSCOUNT -lt 2 ] && skip "needs >= 2 MDTs" && return
+
+	local remote_dir=$DIR/$tdir/remote_dir
+	local MDTIDX=1
+	local rc=0
+
+	mkdir -p $DIR/$tdir
+	$LFS mkdir -i $MDTIDX $remote_dir ||
+		error "create remote directory failed"
+
+	cp /etc/hosts $remote_dir/$tfile
+
+	fid=$($LFS path2fid $remote_dir/$tfile)
+	rc=$?
+	[ $rc -ne 0 ] && error "error: could not get fid for $remote_dir/$tfile"
+
+	dot_lustre_fid_permission_check "$fid" $remote_dir ||
+		error "dot lustre permission check $fid failed"
+	rm -rf $DIR/$tdir
+}
+run_test 154b "Open-by-FID for remote directory"
 
 test_155_small_load() {
     local temp=$TMP/$tfile
@@ -8888,7 +9244,7 @@ test_160() {
 }
 run_test 160 "changelog sanity"
 
-test_161() {
+test_161a() {
 	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
     test_mkdir -p $DIR/$tdir
     cp /etc/hosts $DIR/$tdir/$tfile
@@ -8898,11 +9254,11 @@ test_161() {
     ln $DIR/$tdir/$tfile $DIR/$tdir/foo2/zachary
     ln $DIR/$tdir/$tfile $DIR/$tdir/foo1/luna
     ln $DIR/$tdir/$tfile $DIR/$tdir/foo2/thor
-    local FID=$($LFS path2fid $DIR/$tdir/$tfile | tr -d '[')
-    if [ "$($LFS fid2path $DIR $FID | wc -l)" != "5" ]; then
-	$LFS fid2path $DIR $FID
-	err17935 "bad link ea"
-    fi
+	local FID=$($LFS path2fid $DIR/$tdir/$tfile | tr -d '[]')
+	if [ "$($LFS fid2path $DIR $FID | wc -l)" != "5" ]; then
+		$LFS fid2path $DIR $FID
+		err17935 "bad link ea"
+	fi
     # middle
     rm $DIR/$tdir/foo2/zachary
     # last
@@ -8928,7 +9284,59 @@ test_161() {
     unlinkmany $DIR/$tdir/foo2/$longname 1000 || \
 	error "failed to unlink many hardlinks"
 }
-run_test 161 "link ea sanity"
+run_test 161a "link ea sanity"
+
+test_161b() {
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
+	[ $MDSCOUNT -lt 2 ] &&
+		skip "skipping remote directory test" && return
+	local MDTIDX=1
+	local remote_dir=$DIR/$tdir/remote_dir
+
+	mkdir -p $DIR/$tdir
+	$LFS mkdir -i $MDTIDX $remote_dir ||
+		error "create remote directory failed"
+
+	cp /etc/hosts $remote_dir/$tfile
+	mkdir -p $remote_dir/foo1
+	mkdir -p $remote_dir/foo2
+	ln $remote_dir/$tfile $remote_dir/foo1/sofia
+	ln $remote_dir/$tfile $remote_dir/foo2/zachary
+	ln $remote_dir/$tfile $remote_dir/foo1/luna
+	ln $remote_dir/$tfile $remote_dir/foo2/thor
+
+	local FID=$($LFS path2fid $remote_dir/$tfile | tr -d '[' |
+		     tr -d ']')
+	if [ "$($LFS fid2path $DIR $FID | wc -l)" != "5" ]; then
+		$LFS fid2path $DIR $FID
+		err17935 "bad link ea"
+	fi
+	# middle
+	rm $remote_dir/foo2/zachary
+	# last
+	rm $remote_dir/foo2/thor
+	# first
+	rm $remote_dir/$tfile
+	# rename
+	mv $remote_dir/foo1/sofia $remote_dir/foo2/maggie
+	local link_path=$($LFS fid2path $FSNAME --link 1 $FID)
+	if [ "$DIR/$link_path" != "$remote_dir/foo2/maggie" ]; then
+		$LFS fid2path $DIR $FID
+		err17935 "bad link rename"
+	fi
+	rm $remote_dir/foo2/maggie
+
+	# overflow the EA
+	local longname=filename_avg_len_is_thirty_two_
+	createmany -l$remote_dir/foo1/luna $remote_dir/foo2/$longname 1000 ||
+		error "failed to hardlink many files"
+	links=$($LFS fid2path $DIR $FID | wc -l)
+	echo -n "${links}/1000 links in link EA"
+	[ ${links} -gt 60 ] || err17935 "expected at least 60 links in link EA"
+	unlinkmany $remote_dir/foo2/$longname 1000 ||
+	error "failed to unlink many hardlinks"
+}
+run_test 161b "link ea sanity under remote directory"
 
 check_path() {
     local expected=$1
@@ -9252,6 +9660,173 @@ test_183() { # LU-2275
 }
 run_test 183 "No crash or request leak in case of strange dispositions ========"
 
+# test suite 184 is for LU-2016, LU-2017
+test_184a() {
+	check_swap_layouts_support && return 0
+
+	dir0=$DIR/$tdir/$testnum
+	test_mkdir -p $dir0 || error "creating dir $dir0"
+	ref1=/etc/passwd
+	ref2=/etc/group
+	file1=$dir0/f1
+	file2=$dir0/f2
+	$SETSTRIPE -c1 $file1
+	cp $ref1 $file1
+	$SETSTRIPE -c2 $file2
+	cp $ref2 $file2
+	gen1=$($GETSTRIPE -g $file1)
+	gen2=$($GETSTRIPE -g $file2)
+
+	$LFS swap_layouts $file1 $file2 || error "swap of file layout failed"
+	gen=$($GETSTRIPE -g $file1)
+	[[ $gen1 != $gen ]] ||
+		"Layout generation on $file1 does not change"
+	gen=$($GETSTRIPE -g $file2)
+	[[ $gen2 != $gen ]] ||
+		"Layout generation on $file2 does not change"
+
+	cmp $ref1 $file2 || error "content compare failed ($ref1 != $file2)"
+	cmp $ref2 $file1 || error "content compare failed ($ref2 != $file1)"
+}
+run_test 184a "Basic layout swap"
+
+test_184b() {
+	check_swap_layouts_support && return 0
+
+	dir0=$DIR/$tdir/$testnum
+	mkdir -p $dir0 || error "creating dir $dir0"
+	file1=$dir0/f1
+	file2=$dir0/f2
+	file3=$dir0/f3
+	dir1=$dir0/d1
+	dir2=$dir0/d2
+	mkdir $dir1 $dir2
+	$SETSTRIPE -c1 $file1
+	$SETSTRIPE -c2 $file2
+	$SETSTRIPE -c1 $file3
+	chown $RUNAS_ID $file3
+	gen1=$($GETSTRIPE -g $file1)
+	gen2=$($GETSTRIPE -g $file2)
+
+	$LFS swap_layouts $dir1 $dir2 &&
+		error "swap of directories layouts should fail"
+	$LFS swap_layouts $dir1 $file1 &&
+		error "swap of directory and file layouts should fail"
+	$RUNAS $LFS swap_layouts $file1 $file2 &&
+		error "swap of file we cannot write should fail"
+	$LFS swap_layouts $file1 $file3 &&
+		error "swap of file with different owner should fail"
+	/bin/true # to clear error code
+}
+run_test 184b "Forbidden layout swap (will generate errors)"
+
+test_184c() {
+	check_swap_layouts_support && return 0
+
+	local dir0=$DIR/$tdir/$testnum
+	mkdir -p $dir0 || error "creating dir $dir0"
+
+	local ref1=$dir0/ref1
+	local ref2=$dir0/ref2
+	local file1=$dir0/file1
+	local file2=$dir0/file2
+	# create a file large enough for the concurent test
+	dd if=/dev/urandom of=$ref1 bs=1M count=$((RANDOM % 50 + 20))
+	dd if=/dev/urandom of=$ref2 bs=1M count=$((RANDOM % 50 + 20))
+	echo "ref file size: ref1(`stat -c %s $ref1`), ref2(`stat -c %s $ref2`)"
+
+	cp $ref2 $file2
+	dd if=$ref1 of=$file1 bs=16k &
+	local DD_PID=$!
+
+	# Make sure dd starts to copy file
+	while [ ! -f $file1 ]; do sleep 0.1; done
+
+	$LFS swap_layouts $file1 $file2
+	local rc=$?
+	wait $DD_PID
+	[[ $? == 0 ]] || error "concurrent write on $file1 failed"
+	[[ $rc == 0 ]] || error "swap of $file1 and $file2 failed"
+
+	# how many bytes copied before swapping layout
+	local copied=`stat -c %s $file2`
+	local remaining=`stat -c %s $ref1`
+	remaining=$((remaining - copied))
+	echo "Copied $copied bytes before swapping layout..."
+
+	cmp -n $copied $file1 $ref2 | grep differ &&
+		error "Content mismatch [0, $copied) of ref2 and file1"
+	cmp -n $copied $file2 $ref1 ||
+		error "Content mismatch [0, $copied) of ref1 and file2"
+	cmp -i $copied:$copied -n $remaining $file1 $ref1 ||
+		error "Content mismatch [$copied, EOF) of ref1 and file1"
+
+	# clean up
+	rm -f $ref1 $ref2 $file1 $file2
+}
+run_test 184c "Concurrent write and layout swap"
+
+test_184d() {
+	check_swap_layouts_support && return 0
+
+	local file1=$DIR/$tdir/$tfile-1
+	local file2=$DIR/$tdir/$tfile-2
+	local file3=$DIR/$tdir/$tfile-3
+	local lovea1
+	local lovea2
+
+	mkdir -p $DIR/$tdir
+	touch $file1 || error "create $file1 failed"
+	$OPENFILE -f O_CREAT:O_LOV_DELAY_CREATE $file2 ||
+		error "create $file2 failed"
+	$OPENFILE -f O_CREAT:O_LOV_DELAY_CREATE $file3 ||
+		error "create $file3 failed"
+	lovea1=$($LFS getstripe $file1 | sed 1d)
+
+	$LFS swap_layouts $file2 $file3 ||
+		error "swap $file2 $file3 layouts failed"
+	$LFS swap_layouts $file1 $file2 ||
+		error "swap $file1 $file2 layouts failed"
+
+	lovea2=$($LFS getstripe $file2 | sed 1d)
+	[ "$lovea1" == "$lovea2" ] || error "lovea $lovea1 != $lovea2"
+
+	lovea1=$(getfattr -n trusted.lov $file1 | grep ^trusted)
+	[ -z $lovea1 ] || error "$file1 shouldn't have lovea"
+}
+run_test 184d "allow stripeless layouts swap"
+
+
+test_185() { # LU-2441
+	mkdir -p $DIR/$tdir || error "creating dir $DIR/$tdir"
+	touch $DIR/$tdir/spoo
+	local mtime1=$(stat -c "%Y" $DIR/$tdir)
+	local fid=$($MULTIOP $DIR/$tdir VFw4096c) ||
+		error "cannot create/write a volatile file"
+	$CHECKSTAT -t file $MOUNT/.lustre/fid/$fid 2>/dev/null &&
+		error "FID is still valid after close"
+
+	multiop_bg_pause $DIR/$tdir vVw4096_c
+	local multi_pid=$!
+
+	local OLD_IFS=$IFS
+	IFS=":"
+	local fidv=($fid)
+	IFS=$OLD_IFS
+	# assume that the next FID for this client is sequential, since stdout
+	# is unfortunately eaten by multiop_bg_pause
+	local n=$((${fidv[1]} + 1))
+	local next_fid="${fidv[0]}:$(printf "0x%x" $n):${fidv[2]}"
+	$CHECKSTAT -t file $MOUNT/.lustre/fid/$next_fid ||
+		error "FID is missing before close"
+	kill -USR1 $multi_pid
+	# 1 second delay, so if mtime change we will see it
+	sleep 1
+	local mtime2=$(stat -c "%Y" $DIR/$tdir)
+	[[ $mtime1 == $mtime2 ]] || error "mtime has changed"
+}
+run_test 185 "Volatile file support"
+
 # OST pools tests
 check_file_in_pool()
 {
@@ -9710,6 +10285,13 @@ verify_jobstats() {
 	fi
 }
 
+jobstats_set() {
+	trap 0
+	NEW_JOBENV=${1:-$OLD_JOBENV}
+	do_facet mgs $LCTL conf_param $FSNAME.sys.jobid_var=$NEW_JOBENV
+	wait_update $HOSTNAME "$LCTL get_param -n jobid_var" $NEW_JOBENV
+}
+
 test_205() { # Job stats
 	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	[ -z "$(lctl get_param -n mdc.*.connect_flags | grep jobstats)" ] &&
@@ -9718,9 +10300,8 @@ test_205() { # Job stats
 	local cmd
 	OLD_JOBENV=`$LCTL get_param -n jobid_var`
 	if [ $OLD_JOBENV != $JOBENV ]; then
-		do_facet mgs $LCTL conf_param $FSNAME.sys.jobid_var=$JOBENV
-		wait_update $HOSTNAME "$LCTL get_param -n jobid_var" \
-			$JOBENV || return 1
+		jobstats_set $JOBENV
+		trap jobstats_set EXIT
 	fi
 
 	# mkdir
@@ -9757,11 +10338,7 @@ test_205() { # Job stats
 	# cleanup
 	rm -f $DIR/jobstats_test_rename
 
-	if [ $OLD_JOBENV != $JOBENV ]; then
-		do_facet mgs $LCTL conf_param $FSNAME.sys.jobid_var=$OLD_JOBENV
-		wait_update $HOSTNAME "$LCTL get_param -n jobid_var" \
-			$OLD_JOBENV || return 1
-	fi
+	[ $OLD_JOBENV != $JOBENV ] && jobstats_set $OLD_JOBENV
 }
 run_test 205 "Verify job stats"
 
@@ -9776,6 +10353,41 @@ test_206() {
 }
 run_test 206 "fail lov_init_raid0() doesn't lbug"
 
+test_207a() {
+	dd if=/dev/zero of=$DIR/$tfile bs=4k count=$((RANDOM%10+1))
+	local fsz=`stat -c %s $DIR/$tfile`
+	cancel_lru_locks mdc
+
+	# do not return layout in getattr intent
+#define OBD_FAIL_MDS_NO_LL_GETATTR 0x170
+	$LCTL set_param fail_loc=0x170
+	local sz=`stat -c %s $DIR/$tfile`
+
+	[ $fsz -eq $sz ] || error "file size expected $fsz, actual $sz"
+
+	rm -rf $DIR/$tfile
+}
+run_test 207a "can refresh layout at glimpse"
+
+test_207b() {
+	dd if=/dev/zero of=$DIR/$tfile bs=4k count=$((RANDOM%10+1))
+	local cksum=`md5sum $DIR/$tfile`
+	local fsz=`stat -c %s $DIR/$tfile`
+	cancel_lru_locks mdc
+	cancel_lru_locks osc
+
+	# do not return layout in getattr intent
+#define OBD_FAIL_MDS_NO_LL_OPEN 0x171
+	$LCTL set_param fail_loc=0x171
+
+	# it will refresh layout after the file is opened but before read issues
+	echo checksum is "$cksum"
+	echo "$cksum" |md5sum -c --quiet || error "file differs"
+
+	rm -rf $DIR/$tfile
+}
+run_test 207b "can refresh layout at open"
+
 test_212() {
 	size=`date +%s`
 	size=$((size % 8192 + 1))
@@ -9941,16 +10553,20 @@ run_test 215 "/proc/sys/lnet exists and has proper content - bugs 18102, 21079,
 
 test_216() { # bug 20317
 	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
-        remote_ost_nodsh && skip "remote OST with nodsh" && return
-        local node
-        local p="$TMP/sanityN-$TESTNAME.parameters"
-        save_lustre_params $HOSTNAME "osc.*.contention_seconds" > $p
-        for node in $(osts_nodes); do
-                save_lustre_params $node "ldlm.namespaces.filter-*.max_nolock_bytes" >> $p
-                save_lustre_params $node "ldlm.namespaces.filter-*.contended_locks" >> $p
-                save_lustre_params $node "ldlm.namespaces.filter-*.contention_seconds" >> $p
-        done
-        clear_osc_stats
+	remote_ost_nodsh && skip "remote OST with nodsh" && return
+
+	local node
+	local facets=$(get_facets OST)
+	local p="$TMP/$TESTSUITE-$TESTNAME.parameters"
+
+	save_lustre_params client "osc.*.contention_seconds" > $p
+	save_lustre_params $facets \
+		"ldlm.namespaces.filter-*.max_nolock_bytes" >> $p
+	save_lustre_params $facets \
+		"ldlm.namespaces.filter-*.contended_locks" >> $p
+	save_lustre_params $facets \
+		"ldlm.namespaces.filter-*.contention_seconds" >> $p
+	clear_osc_stats
 
         # agressive lockless i/o settings
         for node in $(osts_nodes); do
@@ -10167,9 +10783,13 @@ run_test 224b "Don't panic on bulk IO failure"
 MDSSURVEY=${MDSSURVEY:-$(which mds-survey 2>/dev/null || true)}
 test_225a () {
 	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
-       if [ -z ${MDSSURVEY} ]; then
-              skip_env "mds-survey not found" && return
-       fi
+	if [ -z ${MDSSURVEY} ]; then
+	      skip_env "mds-survey not found" && return
+	fi
+
+	[ $MDSCOUNT -ge 2 ] &&
+		skip "skipping now for more than one MDT" && return
+
        [ $(lustre_version_code $SINGLEMDS) -ge $(version_code 2.2.51) ] ||
             { skip "Need MDS version at least 2.2.51"; return; }
 
@@ -10192,16 +10812,19 @@ run_test 225a "Metadata survey sanity with zero-stripe"
 
 test_225b () {
 	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
-       if [ -z ${MDSSURVEY} ]; then
-              skip_env "mds-survey not found" && return
-       fi
-       [ $(lustre_version_code $SINGLEMDS) -ge $(version_code 2.2.51) ] ||
-            { skip "Need MDS version at least 2.2.51"; return; }
 
-       if [ $($LCTL dl | grep -c osc) -eq 0 ]; then
-              skip_env "Need to mount OST to test" && return
-       fi
+	if [ -z ${MDSSURVEY} ]; then
+	      skip_env "mds-survey not found" && return
+	fi
+	[ $(lustre_version_code $SINGLEMDS) -ge $(version_code 2.2.51) ] ||
+	    { skip "Need MDS version at least 2.2.51"; return; }
+
+	if [ $($LCTL dl | grep -c osc) -eq 0 ]; then
+	      skip_env "Need to mount OST to test" && return
+	fi
 
+	[ $MDSCOUNT -ge 2 ] &&
+		skip "skipping now for more than one MDT" && return
        local mds=$(facet_host $SINGLEMDS)
        local target=$(do_nodes $mds 'lctl dl' | \
                       awk "{if (\$2 == \"UP\" && \$3 == \"mdt\") {print \$4}}")
@@ -10247,7 +10870,7 @@ mcreate_path2fid () {
 	echo "pass with $path and $fid"
 }
 
-test_226 () {
+test_226a () {
 	rm -rf $DIR/$tdir
 	mkdir -p $DIR/$tdir
 
@@ -10260,7 +10883,29 @@ test_226 () {
 	mcreate_path2fid 0120666 0 0 link "symbolic link"
 	mcreate_path2fid 0140666 0 0 sock "socket"
 }
-run_test 226 "call path2fid and fid2path on files of all type"
+run_test 226a "call path2fid and fid2path on files of all type"
+
+test_226b () {
+	[ $MDSCOUNT -lt 2 ] && skip "needs >= 2 MDTs" && return
+	rm -rf $DIR/$tdir
+	local MDTIDX=1
+
+	mkdir -p $DIR/$tdir
+	$LFS setdirstripe -i $MDTIDX $DIR/$tdir/remote_dir ||
+		error "create remote directory failed"
+	mcreate_path2fid 0010666 0 0 "remote_dir/fifo" "FIFO"
+	mcreate_path2fid 0020666 1 3 "remote_dir/null" \
+				"character special file (null)"
+	mcreate_path2fid 0020666 1 255 "remote_dir/none" \
+				"character special file (no device)"
+	mcreate_path2fid 0040666 0 0 "remote_dir/dir" "directory"
+	mcreate_path2fid 0060666 7 0 "remote_dir/loop0" \
+				"block special file (loop)"
+	mcreate_path2fid 0100666 0 0 "remote_dir/file" "regular file"
+	mcreate_path2fid 0120666 0 0 "remote_dir/link" "symbolic link"
+	mcreate_path2fid 0140666 0 0 "remote_dir/sock" "socket"
+}
+run_test 226b "call path2fid and fid2path on files of all type under remote dir"
 
 # LU-1299 Executing or running ldd on a truncated executable does not
 # cause an out-of-memory condition.
@@ -10440,6 +11085,7 @@ test_230b() {
 	[ $MDSCOUNT -lt 2 ] && skip "needs >= 2 MDTs" && return
 	local MDTIDX=1
 	local remote_dir=$DIR/$tdir/remote_dir
+	local rc=0
 
 	mkdir -p $DIR/$tdir
 	$LFS mkdir -i $MDTIDX $remote_dir ||
@@ -10448,10 +11094,94 @@ test_230b() {
 	$LFS mkdir -i 0 $remote_dir/new_dir &&
 		error "nested remote directory create succeed!"
 
-	rm -r $DIR/$tdir || error "unlink remote directory failed"
+	do_facet mds$((MDTIDX + 1)) lctl set_param mdt.*.enable_remote_dir=1
+	$LFS mkdir -i 0 $remote_dir/new_dir || rc=$?
+	do_facet mds$((MDTIDX + 1)) lctl set_param mdt.*.enable_remote_dir=0
+
+	[ $rc -ne 0 ] &&
+	   error "create remote directory failed after set enable_remote_dir"
+
+	rm -rf $remote_dir || error "first unlink remote directory failed"
+
+	$RUNAS -G$RUNAS_GID $LFS mkdir -i $MDTIDX $DIR/$tfile &&
+							error "chown worked"
+
+	do_facet mds$MDTIDX lctl set_param \
+				mdt.*.enable_remote_dir_gid=$RUNAS_GID
+	$LFS mkdir -i $MDTIDX $remote_dir || rc=$?
+	do_facet mds$MDTIDX lctl set_param mdt.*.enable_remote_dir_gid=0
+
+	[ $rc -ne 0 ] &&
+	   error "create remote dir failed after set enable_remote_dir_gid"
+
+	rm -r $DIR/$tdir || error "second unlink remote directory failed"
 }
 run_test 230b "nested remote directory should be failed"
 
+test_231a()
+{
+	# For simplicity this test assumes that max_pages_per_rpc
+	# is the same across all OSCs
+	local max_pages=$($LCTL get_param -n osc.*.max_pages_per_rpc | head -1)
+	local bulk_size=$((max_pages * 4096))
+
+	mkdir -p $DIR/$tdir
+
+	# clear the OSC stats
+	$LCTL set_param osc.*.stats=0 &>/dev/null
+
+	# Client writes $bulk_size - there must be 1 rpc for $max_pages.
+	dd if=/dev/zero of=$DIR/$tdir/$tfile bs=$bulk_size count=1 \
+		oflag=direct &>/dev/null || error "dd failed"
+
+	local nrpcs=$($LCTL get_param osc.*.stats |awk '/ost_write/ {print $2}')
+	if [ x$nrpcs != "x1" ]; then
+		error "found $nrpc ost_write RPCs, not 1 as expected"
+	fi
+
+	# Drop the OSC cache, otherwise we will read from it
+	cancel_lru_locks osc
+
+	# clear the OSC stats
+	$LCTL set_param osc.*.stats=0 &>/dev/null
+
+	# Client reads $bulk_size.
+	dd if=$DIR/$tdir/$tfile of=/dev/null bs=$bulk_size count=1 \
+		iflag=direct &>/dev/null || error "dd failed"
+
+	nrpcs=$($LCTL get_param osc.*.stats | awk '/ost_read/ { print $2 }')
+	if [ x$nrpcs != "x1" ]; then
+		error "found $nrpc ost_read RPCs, not 1 as expected"
+	fi
+}
+run_test 231a "checking that reading/writing of BRW RPC size results in one RPC"
+
+test_231b() {
+	mkdir -p $DIR/$tdir
+	local i
+	for i in {0..1023}; do
+		dd if=/dev/zero of=$DIR/$tdir/$tfile conv=notrunc \
+			seek=$((2 * i)) bs=4096 count=1 &>/dev/null ||
+			error "dd of=$DIR/$tdir/$tfile seek=$((2 * i)) failed"
+	done
+	sync
+}
+run_test 231b "must not assert on fully utilized OST request buffer"
+
+test_232() {
+	mkdir -p $DIR/$tdir
+	#define OBD_FAIL_LDLM_OST_LVB		 0x31c
+	$LCTL set_param fail_loc=0x31c
+
+	# ignore dd failure
+	dd if=/dev/zero of=$DIR/$tdir/$tfile bs=1M count=1 || true
+
+	$LCTL set_param fail_loc=0
+	umount_client $MOUNT || error "umount failed"
+	mount_client $MOUNT || error "mount failed"
+}
+run_test 232 "failed lock should not block umount"
+
 #
 # tests that do cleanup/setup should be run at the end
 #