* Removed the (new) tcp zero-copy patches

[fs/lustre-release.git] / lustre / kernel_patches / patches / iopen-2.4.20.patch

diff --git a/lustre/kernel_patches/patches/iopen-2.4.20.patch b/lustre/kernel_patches/patches/iopen-2.4.20.patch
index f409533..d5a28e6 100644 (file)
--- a/lustre/kernel_patches/patches/iopen-2.4.20.patch
+++ b/lustre/kernel_patches/patches/iopen-2.4.20.patch
@@ -74,7 +74,7 @@ Index: lum/fs/ext3/iopen.c
 ===================================================================
 --- lum.orig/fs/ext3/iopen.c   2004-03-09 16:46:37.000000000 -0700
 +++ lum/fs/ext3/iopen.c        2004-03-09 16:48:03.000000000 -0700
-@@ -0,0 +1,282 @@
+@@ -0,0 +1,285 @@
 +/*
 + * linux/fs/ext3/iopen.c
 + *
@@ -244,6 +244,9 @@ Index: lum/fs/ext3/iopen.c
 +      if (!goal)
 +              goto do_instantiate;
 +
++      if (!test_opt(inode->i_sb, IOPEN))
++              goto do_instantiate;
++
 +      /* Move the goal to the de hash queue - like d_move() */
 +      goal->d_flags &= ~DCACHE_NFSD_DISCONNECTED;
 +      list_del_init(&goal->d_hash);
@@ -434,7 +437,7 @@ Index: lum/fs/ext3/namei.c
 +      if (!err) {
 +              err = ext3_mark_inode_dirty(handle, inode);
 +              if (err == 0) {
-+                      (void)iopen_connect_dentry(dentry, inode, 0);
++                      dput(iopen_connect_dentry(dentry, inode, 0));
 +                      return 0;
 +              }
 +      }
@@ -483,12 +486,10 @@ Index: lum/include/linux/ext3_fs.h
 ===================================================================
 --- lum.orig/include/linux/ext3_fs.h   2004-01-30 14:54:53.000000000 -0700
 +++ lum/include/linux/ext3_fs.h        2004-03-09 16:46:46.000000000 -0700
-@@ -322,6 +322,8 @@
- #define EXT3_MOUNT_UPDATE_JOURNAL     0x1000  /* Update the journal format */
- #define EXT3_MOUNT_NO_UID32           0x2000  /* Disable 32-bit UIDs */
+@@ -324,4 +324,6 @@
  #define EXT3_MOUNT_XATTR_USER         0x4000  /* Extended user attributes */
-+#define EXT3_MOUNT_IOPEN              0x8000  /* Allow access via iopen */
-+#define EXT3_MOUNT_IOPEN_NOPRIV               0x10000 /* Make iopen world-readable */
  #define EXT3_MOUNT_ASYNCDEL           0x20000 /* Delayed deletion */
++#define EXT3_MOUNT_IOPEN              0x80000 /* Allow access via iopen */
++#define EXT3_MOUNT_IOPEN_NOPRIV               0x100000/* Make iopen world-readable */
  
  /* Compatibility, for having both ext2_fs.h and ext3_fs.h included at once */