Branch b1_6

b=14714

Fixed previous commit error.

diff --git a/lustre/kernel_patches/patches/vfs_races-2.6-rhel4.patch b/lustre/kernel_patches/patches/vfs_races-2.6-rhel4.patch
index 61ee9da..04ac6fe 100644 (file)
--- a/lustre/kernel_patches/patches/vfs_races-2.6-rhel4.patch
+++ b/lustre/kernel_patches/patches/vfs_races-2.6-rhel4.patch
@@ -61,11 +61,3 @@ diff -urp RH_2_6_9_42_0_3.orig/include/linux/dcache.h RH_2_6_9_42_0_3/include/li
  
  extern spinlock_t dcache_lock;
  
-@@ -254,6 +255,7 @@ extern int have_submounts(struct dentry 
-  * This adds the entry to the hash queues.
-  */
- extern void d_rehash(struct dentry *);
-+extern void d_rehash_cond(struct dentry *, int lock);
- 
- /**
-  * d_add - add dentry to hash queues