Branch HEAD

b=14714
i=adilger, johann

Fixed previous error.

lustre/kernel_patches/patches/iopen-misc-2.6.18-vanilla.patch

@@ -64,14 +64,6 @@ Index: linux-2.6/include/linux/dcache.h
 ===================================================================
 --- linux-2.6.orig/include/linux/dcache.h	2006-07-15 12:48:41.000000000 +0800
 +++ linux-2.6/include/linux/dcache.h	2006-07-15 12:54:06.000000000 +0800
-@@ -257,6 +257,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
 @@ -292,6 +293,7 @@ static inline struct dentry *d_add_uniqu
  
  /* used for rename() and baskets */