land v0.9.1 on HEAD, in preparation for a 1.0.x branch

[fs/lustre-release.git] / lustre / kernel_patches / patches / vfs_races_2.5.72_rev1.patch

diff --git a/lustre/kernel_patches/patches/vfs_races_2.5.72_rev1.patch b/lustre/kernel_patches/patches/vfs_races_2.5.72_rev1.patch
index f1eeb01..1dfed66 100644 (file)
--- a/lustre/kernel_patches/patches/vfs_races_2.5.72_rev1.patch
+++ b/lustre/kernel_patches/patches/vfs_races_2.5.72_rev1.patch
@@ -1,10 +1,9 @@
  fs/dcache.c            |   24 ++++++++++++++++++++----
- fs/namei.c             |    4 +++-
  include/linux/dcache.h |    2 ++
- 3 files changed, 25 insertions(+), 5 deletions(-)
+ 2 files changed, 22 insertions(+), 4 deletions(-)
 
---- linux-2.5.72/fs/dcache.c~vfs_races_2.5.72_rev1     2003-06-16 22:19:41.000000000 -0600
-+++ linux-2.5.72-braam/fs/dcache.c     2003-06-25 08:33:08.000000000 -0600
+--- linux-2.6.0-test1/fs/dcache.c~vfs_races_2.5.72_rev1        2003-07-24 15:52:47.000000000 +0400
++++ linux-2.6.0-test1-alexey/fs/dcache.c       2003-09-13 16:21:16.000000000 +0400
 @@ -212,7 +212,14 @@ int d_invalidate(struct dentry * dentry)
                spin_unlock(&dcache_lock);
                return 0;
@@ -21,7 +20,7 @@
         * Check whether to do a partial shrink_dcache
         * to get rid of unused child entries.
         */
-@@ -1132,14 +1139,23 @@ void d_delete(struct dentry * dentry)
+@@ -1135,14 +1142,23 @@ void d_delete(struct dentry * dentry)
   * Adds a dentry to the hash according to its name.
   */
   
@@ -48,29 +47,9 @@
  }
  
  #define do_switch(x,y) do { \
---- linux-2.5.72/fs/namei.c~vfs_races_2.5.72_rev1      2003-06-25 08:33:06.000000000 -0600
-+++ linux-2.5.72-braam/fs/namei.c      2003-06-25 08:50:18.000000000 -0600
-@@ -368,6 +368,8 @@ static struct dentry * real_lookup(struc
-       struct dentry * result;
-       struct inode *dir = parent->d_inode;
- 
-+ again: 
-+
-       down(&dir->i_sem);
-       /*
-        * First re-do the cached lookup just in case it was created
-@@ -415,7 +417,7 @@ static struct dentry * real_lookup(struc
-               if (!result->d_op->d_revalidate_it(result, flags, nd) &&
-                   !d_invalidate(result)) {
-                       dput(result);
--                      result = ERR_PTR(-ENOENT);
-+                      goto again;
-               }
-       }
-       return result;
---- linux-2.5.72/include/linux/dcache.h~vfs_races_2.5.72_rev1  2003-06-25 08:25:04.000000000 -0600
-+++ linux-2.5.72-braam/include/linux/dcache.h  2003-06-25 08:33:08.000000000 -0600
-@@ -180,6 +180,8 @@ d_iput:            no              no              yes
+--- linux-2.6.0-test1/include/linux/dcache.h~vfs_races_2.5.72_rev1     2003-09-13 16:21:05.000000000 +0400
++++ linux-2.6.0-test1-alexey/include/linux/dcache.h    2003-09-13 16:21:16.000000000 +0400
+@@ -156,6 +156,8 @@ d_iput:            no              no              yes
  
  #define DCACHE_REFERENCED     0x0008  /* Recently used, don't discard. */
  #define DCACHE_UNHASHED               0x0010