Branch HEAD

[fs/lustre-release.git] / lustre / kernel_patches / patches / iopen-misc-2.6-suse.patch

diff --git a/lustre/kernel_patches/patches/iopen-misc-2.6-suse.patch b/lustre/kernel_patches/patches/iopen-misc-2.6-suse.patch
index 2d70c7b..d9ef03b 100644 (file)
--- a/lustre/kernel_patches/patches/iopen-misc-2.6-suse.patch
+++ b/lustre/kernel_patches/patches/iopen-misc-2.6-suse.patch
@@ -29,35 +29,24 @@ Index: linux-2.6.4-51.0/fs/dcache.c
 ===================================================================
 --- linux-2.6.4-51.0.orig/fs/dcache.c  2004-05-06 22:24:42.000000000 -0400
 +++ linux-2.6.4-51.0/fs/dcache.c       2004-05-06 22:58:37.000000000 -0400
-@@ -1195,12 +1195,11 @@
+@@ -1195,7 +1195,7 @@
   * dcache entries should not be moved in this way.
   */
  
--void d_move(struct dentry * dentry, struct dentry * target)
-+void __d_move(struct dentry * dentry, struct dentry * target)
+-static void d_move_locked(struct dentry * dentry, struct dentry * target)
++void d_move_locked(struct dentry * dentry, struct dentry * target)
  {
-       if (!dentry->d_inode)
-               printk(KERN_WARNING "VFS: moving negative dcache entry\n");
- 
--      spin_lock(&dcache_lock);
-       write_seqlock(&rename_lock);
-       /*
-        * XXXX: do we really need to take target->d_lock?
-@@ -1253,6 +1252,14 @@
-       spin_unlock(&target->d_lock);
-       spin_unlock(&dentry->d_lock);
+       struct hlist_head *list;
+
+@@ -1253,6 +1252,8 @@
        write_sequnlock(&rename_lock);
-+}
-+
-+EXPORT_SYMBOL(__d_move);
-+
-+void d_move(struct dentry *dentry, struct dentry *target)
-+{
-+      spin_lock(&dcache_lock);
-+      __d_move(dentry, target);
-       spin_unlock(&dcache_lock);
  }
  
++EXPORT_SYMBOL(d_move_locked);
++
+ /**
+  * d_move - move a dentry
+  * @dentry: entry to move
 Index: linux-2.6.4-51.0/include/linux/dcache.h
 ===================================================================
 --- linux-2.6.4-51.0.orig/include/linux/dcache.h       2004-05-06 22:24:42.000000000 -0400
@@ -66,7 +55,7 @@ Index: linux-2.6.4-51.0/include/linux/dcache.h
   * This adds the entry to the hash queues.
   */
  extern void d_rehash(struct dentry *);
-+extern void __d_rehash(struct dentry *, int lock);
++extern void d_rehash_cond(struct dentry *, int lock);
  
  /**
   * d_add - add dentry to hash queues
@@ -74,7 +63,7 @@ Index: linux-2.6.4-51.0/include/linux/dcache.h
  
  /* used for rename() and baskets */
  extern void d_move(struct dentry *, struct dentry *);
-+extern void __d_move(struct dentry *, struct dentry *);
++extern void d_move_locked(struct dentry *, struct dentry *);
  
  /* appendix may either be NULL or be used for transname suffixes */
  extern struct dentry * d_lookup(struct dentry *, struct qstr *);