update from HEAD

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 (file)
--- 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/kernel_patches/patches/vfs_intent-2.4.21-chaos.patch b/lustre/kernel_patches/patches/vfs_intent-2.4.21-chaos.patch
index 6affaed..1ceb50d 100644 (file)
--- a/lustre/kernel_patches/patches/vfs_intent-2.4.21-chaos.patch
+++ b/lustre/kernel_patches/patches/vfs_intent-2.4.21-chaos.patch
@@ -1605,9 +1605,9 @@ Index: linux-2.4.21-chaos/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);
 +
 +

diff --git a/lustre/ptlrpc/ptlrpcd.c b/lustre/ptlrpc/ptlrpcd.c
index b7b9700..aff00b8 100644 (file)
--- a/lustre/ptlrpc/ptlrpcd.c
+++ b/lustre/ptlrpc/ptlrpcd.c
@@ -67,12 +67,18 @@ static struct ptlrpcd_ctl {
 static DECLARE_MUTEX(ptlrpcd_sem);
 static int ptlrpcd_users = 0;
 
+void ptlrpcd_wake(void)
+{
+        struct ptlrpcd_ctl *pc = &ptlrpcd_pc;
+        wake_up(&pc->pc_waitq);
+}
+
 void ptlrpcd_add_req(struct ptlrpc_request *req)
 {
         struct ptlrpcd_ctl *pc = &ptlrpcd_pc;
 
         ptlrpc_set_add_new_req(pc->pc_set, req);
-        wake_up(&pc->pc_waitq);
+        ptlrpcd_wake();
 }
 
 static int ptlrpcd_check(struct ptlrpcd_ctl *pc)