- fix netlink (inet_diag) inside vservers

[packages/kernel.git] / kernel-vfs_races-2.6.20-vanilla.patch

Index: linux-2.6.20.3/fs/dcache.c
===================================================================
--- linux-2.6.20.3.orig/fs/dcache.c	2007-08-14 18:10:44.000000000 +0200
+++ linux-2.6.20.3/fs/dcache.c	2007-08-14 18:17:16.000000000 +0200
@@ -235,6 +235,13 @@
 		spin_unlock(&dcache_lock);
 		return 0;
 	}
+
+	/* network invalidation by Lustre */
+	if (dentry->d_flags & DCACHE_LUSTRE_INVALID) {
+		spin_unlock(&dcache_lock);
+		return 0;
+	}
+
 	/*
 	 * Check whether to do a partial shrink_dcache
 	 * to get rid of unused child entries.
@@ -1412,13 +1419,22 @@
  * 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)
 {
-	spin_lock(&dcache_lock);
+	if (lock)
+		spin_lock(&dcache_lock);
 	spin_lock(&entry->d_lock);
 	_d_rehash(entry);
 	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.20.3/include/linux/dcache.h
===================================================================
--- linux-2.6.20.3.orig/include/linux/dcache.h	2007-08-14 18:10:44.000000000 +0200
+++ linux-2.6.20.3/include/linux/dcache.h	2007-08-14 18:17:16.000000000 +0200
@@ -173,6 +173,8 @@
 
 #define DCACHE_REFERENCED	0x0008  /* Recently used, don't discard. */
 #define DCACHE_UNHASHED		0x0010	
+#define DCACHE_LUSTRE_INVALID     0x0040  /* Lustre invalidated */
+
 
 #define DCACHE_INOTIFY_PARENT_WATCHED	0x0020 /* Parent inode is watched */