From: tianying <tianying>
Date: Wed, 28 Jan 2004 08:32:10 +0000 (+0000)
Subject:    update from HEAD
X-Git-Tag: v1_7_100~1^248~47
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=5c11145f740edc54f0ffd6cad0e3abfd08d01f69;p=fs%2Flustre-release.git

   update from HEAD
---

diff --git a/lustre/kernel_patches/patches/ext3-ea-in-inode-2.6.0.patch b/lustre/kernel_patches/patches/ext3-ea-in-inode-2.6.0.patch
index 8a2e578..5e755d9 100644
--- a/lustre/kernel_patches/patches/ext3-ea-in-inode-2.6.0.patch
+++ b/lustre/kernel_patches/patches/ext3-ea-in-inode-2.6.0.patch
@@ -644,7 +644,7 @@ Index: linux-2.6.0/fs/ext3/xattr.c
   * ext3_xattr_set_handle()
   *
   * Create, replace or remove an extended attribute for this inode. Buffer
-@@ -470,6 +959,103 @@
+@@ -470,6 +959,104 @@
   */
  int
  ext3_xattr_set_handle(handle_t *handle, struct inode *inode, int name_index,
@@ -686,10 +686,11 @@ Index: linux-2.6.0/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/kernel_patches/patches/vfs_intent-2.4.21-suse2.patch b/lustre/kernel_patches/patches/vfs_intent-2.4.21-suse2.patch
index 1e78f10..98c6c37 100644
--- a/lustre/kernel_patches/patches/vfs_intent-2.4.21-suse2.patch
+++ b/lustre/kernel_patches/patches/vfs_intent-2.4.21-suse2.patch
@@ -1613,9 +1613,9 @@ Index: linux-2.4.21-suse2/include/linux/dcache.h
 +	void (*d_unpin)(struct dentry *, struct vfsmount *, int);
  };
  
-+#define PIN(de,mnt,flag)  if (de->d_op && de->d_op->d_pin) \
++#define PIN(de,mnt,flag)  if (de && de->d_op && de->d_op->d_pin) \
 +				de->d_op->d_pin(de, mnt, flag);
-+#define UNPIN(de,mnt,flag)  if (de->d_op && de->d_op->d_unpin) \
++#define UNPIN(de,mnt,flag)  if (de && de->d_op && de->d_op->d_unpin) \
 +				de->d_op->d_unpin(de, mnt, flag);
 +
 +