merge b_devel into b_setattr

- sanity passes, but open(O_TRUNC) seems to leak a dentry/inode ref

diff --git a/lustre/tests/mount2.sh b/lustre/tests/mount2.sh
index f1c00b4..07de3ed 100644 (file)
--- a/lustre/tests/mount2.sh
+++ b/lustre/tests/mount2.sh
@@ -2,7 +2,9 @@
 
 config=${1:-mount2.xml}
 
-LMC="${LMC:-../utils/lmc} -m $config"
+SRCDIR=`dirname $0`
+PATH=$SRCDIR:$SRCDIR/../utils:$PATH
+LMC="${LMC:-lmc} -m $config"
 TMP=${TMP:-/tmp}
 
 MDSDEV=${MDSDEV:-$TMP/mds1}
@@ -11,17 +13,6 @@ MDSSIZE=${MDSSIZE:-50000}
 OSTDEV=${OSTDEV:-$TMP/ost1}
 OSTSIZE=${OSTSIZE:-200000}
 
-kver=`uname -r | cut -d "." -f 1,2`
-
-case $kver in
-  2.4) FSTYPE="--fstype=extN"  ;;
-  2.5) FSTYPE="--fstype=ext3"  ;;
-  *) echo "Kernel version $kver not supported"
-     exit 1
-     ;;
-esac
-
-
 rm -f $config
 
 # create nodes
@@ -32,8 +23,8 @@ ${LMC} --add net --node  localhost --nid localhost --nettype tcp || exit 11
 ${LMC} --add mds  --node localhost --mds mds1 --dev $MDSDEV --size $MDSSIZE || exit 20
 
 # configure ost
-${LMC} --add ost --node localhost --obd obd1 --dev $OSTDEV --size  $OSTSIZE || exit 30
+${LMC} --add ost --node localhost --ost ost1 --dev $OSTDEV --size  $OSTSIZE || exit 30
 
 # create client config
-${LMC} --add mtpt --node localhost --path /mnt/lustre1 --mds mds1 --obd obd1 || exit 40
-${LMC} --add mtpt --node localhost --path /mnt/lustre2 --mds mds1 --obd obd1 || exit 40
+${LMC} --add mtpt --node localhost --path /mnt/lustre1 --mds mds1 --ost ost1 || exit 40
+${LMC} --add mtpt --node localhost --path /mnt/lustre2 --mds mds1 --ost ost1 || exit 40