Index: linux-2.6.11/fs/dcache.c
===================================================================
--- linux-2.6.11.orig/fs/dcache.c	2005-04-13 22:44:37.698760922 -0400
+++ linux-2.6.11/fs/dcache.c	2005-04-13 22:44:50.482498026 -0400
@@ -1197,15 +1197,24 @@
  * Adds a dentry to the hash according to its name.
  */
  
-void d_rehash(struct dentry * entry)
+void d_rehash_cond(struct dentry * entry, int lock)
 {
 	struct hlist_head *list = d_hash(entry->d_parent, entry->d_name.hash);
 
-	spin_lock(&dcache_lock);
+	if (lock)
+		spin_lock(&dcache_lock);
 	spin_lock(&entry->d_lock);
 	__d_rehash(entry, list);
 	spin_unlock(&entry->d_lock);
-	spin_unlock(&dcache_lock);
+	if (lock)
+		spin_unlock(&dcache_lock);
+}
+
+EXPORT_SYMBOL(d_rehash_cond);
+
+void d_rehash(struct dentry * entry)
+{
+	d_rehash_cond(entry, 1);
 }
 
 #define do_switch(x,y) do { \
Index: linux-2.6.11/include/linux/dcache.h
===================================================================
--- linux-2.6.11.orig/include/linux/dcache.h	2005-04-13 22:35:23.515178600 -0400
+++ linux-2.6.11/include/linux/dcache.h	2005-04-13 22:44:43.188221365 -0400
@@ -159,6 +159,8 @@
 
 #define DCACHE_REFERENCED	0x0008  /* Recently used, don't discard. */
 #define DCACHE_UNHASHED		0x0010	
+#define DCACHE_LUSTRE_INVALID     0x0020  /* Lustre invalidated */
+
 
 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