From a5d97c32057b38b15c540e04cfaea093e5e21ed9 Mon Sep 17 00:00:00 2001
From: adilger <adilger>
Date: Mon, 26 Jan 2004 17:54:08 +0000
Subject: [PATCH] Merge HEAD->bug974 (20040126_1001). b=974

---
 .../kernel_patches/patches/ext3-ea-in-inode-2.4.21-chaos.patch   | 9 +++++----
 lustre/tests/oos.sh                                              | 6 +++---
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/lustre/kernel_patches/patches/ext3-ea-in-inode-2.4.21-chaos.patch b/lustre/kernel_patches/patches/ext3-ea-in-inode-2.4.21-chaos.patch
index b09a58b..4a68c63 100644
--- a/lustre/kernel_patches/patches/ext3-ea-in-inode-2.4.21-chaos.patch
+++ b/lustre/kernel_patches/patches/ext3-ea-in-inode-2.4.21-chaos.patch
@@ -331,7 +331,7 @@ Index: linux-2.4.21-chaos/fs/ext3/xattr.c
  /*
   * If the EXT3_FEATURE_COMPAT_EXT_ATTR feature of this file system is
   * not set, set it.
-@@ -480,6 +691,101 @@
+@@ -480,6 +691,102 @@
   */
  int
  ext3_xattr_set_handle(handle_t *handle, struct inode *inode, int name_index,
@@ -372,10 +372,11 @@ Index: linux-2.4.21-chaos/fs/ext3/xattr.c
 +		if (err != 0 && err != -ENOENT) {
 +			/* not found EA in block */
 +			goto finish;	
++		} else if (err == 0) {
++			/* found EA in block */
++			where = 1;
++			found = 1;
 +		}
-+		/* found EA in block */
-+		where = 1;
-+		found = 1;
 +	} else
 +		goto finish;
 +
diff --git a/lustre/tests/oos.sh b/lustre/tests/oos.sh
index dc66c16..d2f1bc8 100755
--- a/lustre/tests/oos.sh
+++ b/lustre/tests/oos.sh
@@ -16,7 +16,7 @@ SUCCESS=1
 rm -f $OOS
 
 STRIPECOUNT=`cat /proc/fs/lustre/lov/*/activeobd | head -1`
-ORIGFREE=`df | grep $MOUNT | awk '{ print $4 }'`
+ORIGFREE=`cat /proc/fs/lustre/llite/*/kbytesavail | head -1`
 MAXFREE=${MAXFREE:-$((200000 * $STRIPECOUNT))}
 if [ $ORIGFREE -gt $MAXFREE ]; then
 	echo "skipping out-of-space test on $OSC"
@@ -41,7 +41,7 @@ if [ -z "`grep "No space left on device" $LOG`" ]; then
 	SUCCESS=0
 fi
 
-LEFTFREE=`df | grep $MOUNT | awk '{ print $4 }'`
+LEFTFREE=`cat /proc/fs/lustre/llite/*/kbytesavail | head -1`
 if [ $(($ORIGFREE - $LEFTFREE)) -lt $RECORDSOUT ]; then
         echo "ERROR: space used by dd not equal to available space"
         SUCCESS=0
@@ -50,7 +50,7 @@ fi
 
 if [ $LEFTFREE -gt $((400 * $STRIPECOUNT)) ]; then
 	echo "ERROR: too much space left $LEFTFREE and -ENOSPC returned"
-	grep '[0-9]' /proc/fs/lustre/osc/OSC*MNT*/cur*
+	grep "[0-9]" /proc/fs/lustre/osc/OSC*MNT*/cur*
 	SUCCESS=0
 fi
 
-- 
1.8.3.1