LU-506 kernel: FC15 - small changes

[fs/lustre-release.git] / lustre / kernel_patches / patches / vfs_races-2.6-rhel5.patch

diff --git a/lustre/kernel_patches/patches/vfs_races-2.6-rhel5.patch b/lustre/kernel_patches/patches/vfs_races-2.6-rhel5.patch
index eb659fd..4131b6b 100644 (file)
--- a/lustre/kernel_patches/patches/vfs_races-2.6-rhel5.patch
+++ b/lustre/kernel_patches/patches/vfs_races-2.6-rhel5.patch
@@ -40,37 +40,6 @@ diff -urp linux-2.6.18.rawops/fs/dcache.c linux-2.6.18.races/fs/dcache.c
  }
  
  #define do_switch(x,y) do { \
-@@ -1481,14 +1496,13 @@ static void switch_names(struct dentry *
-  * 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)
- {
-       struct hlist_head *list;
- 
-       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?
-@@ -1549,6 +1563,14 @@ already_unhashed:
-       fsnotify_d_move(dentry);
-       spin_unlock(&dentry->d_lock);
-       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);
- }
- 
 diff -urp linux-2.6.18.rawops/include/linux/dcache.h linux-2.6.18.races/include/linux/dcache.h
 --- linux-2.6.18.rawops/include/linux/dcache.h 2007-02-14 16:52:37.000000000 +0200
 +++ linux-2.6.18.races/include/linux/dcache.h  2007-02-14 19:21:14.000000000 +0200
@@ -90,11 +59,3 @@ diff -urp linux-2.6.18.rawops/include/linux/dcache.h linux-2.6.18.races/include/
  
  /**
   * d_add - add dentry to hash queues
-@@ -289,6 +291,7 @@ static inline struct dentry *d_add_uniqu
- 
- /* used for rename() and baskets */
- extern void d_move(struct dentry *, struct dentry *);
-+extern void __d_move(struct dentry *, struct dentry *);
- 
- /* appendix may either be NULL or be used for transname suffixes */
- extern struct dentry * d_lookup(struct dentry *, struct qstr *);