1 files changed, 26 insertions, 22 deletions

diff --git a/fs/dcache.c b/fs/dcache.c
index 11dc83092d4a..19458d399502 100644
--- a/fs/dcache.c
+++ b/fs/dcache.c
@@ -34,9 +34,8 @@
 #include <linux/swap.h>
 #include <linux/bootmem.h>
 
-/* #define DCACHE_DEBUG 1 */
 
-int sysctl_vfs_cache_pressure = 100;
+int sysctl_vfs_cache_pressure __read_mostly = 100;
 EXPORT_SYMBOL_GPL(sysctl_vfs_cache_pressure);
 
  __cacheline_aligned_in_smp DEFINE_SPINLOCK(dcache_lock);
@@ -44,7 +43,7 @@ static seqlock_t rename_lock __cacheline_aligned_in_smp = SEQLOCK_UNLOCKED;
 
 EXPORT_SYMBOL(dcache_lock);
 
-static kmem_cache_t *dentry_cache; 
+static kmem_cache_t *dentry_cache __read_mostly;
 
 #define DNAME_INLINE_LEN (sizeof(struct dentry)-offsetof(struct dentry,d_iname))
 
@@ -59,9 +58,9 @@ static kmem_cache_t *dentry_cache;
 #define D_HASHBITS     d_hash_shift
 #define D_HASHMASK     d_hash_mask
 
-static unsigned int d_hash_mask;
-static unsigned int d_hash_shift;
-static struct hlist_head *dentry_hashtable;
+static unsigned int d_hash_mask __read_mostly;
+static unsigned int d_hash_shift __read_mostly;
+static struct hlist_head *dentry_hashtable __read_mostly;
 static LIST_HEAD(dentry_unused);
 
 /* Statistics gathering. */
@@ -325,10 +324,13 @@ static struct dentry * __d_find_alias(struct inode *inode, int want_discon)
 
 struct dentry * d_find_alias(struct inode *inode)
 {
-        struct dentry *de;
-        spin_lock(&dcache_lock);
-        de = __d_find_alias(inode, 0);
-        spin_unlock(&dcache_lock);
+        struct dentry *de = NULL;
+
+        if (!list_empty(&inode->i_dentry)) {
+                spin_lock(&dcache_lock);
+                de = __d_find_alias(inode, 0);
+                spin_unlock(&dcache_lock);
+        }
         return de;
 }
 
@@ -486,6 +488,7 @@ repeat:
                         continue;
                 }
                 prune_one_dentry(dentry);
+                cond_resched_lock(&dcache_lock);
                 goto repeat;
         }
         spin_unlock(&dcache_lock);
@@ -599,10 +602,6 @@ resume:
                  */
                 if (!list_empty(&dentry->d_subdirs)) {
                         this_parent = dentry;
-#ifdef DCACHE_DEBUG
-printk(KERN_DEBUG "select_parent: descending to %s/%s, found=%d\n",
-dentry->d_parent->d_name.name, dentry->d_name.name, found);
-#endif
                         goto repeat;
                 }
         }
@@ -612,10 +611,6 @@ dentry->d_parent->d_name.name, dentry->d_name.name, found);
         if (this_parent != parent) {
                 next = this_parent->d_u.d_child.next;
                 this_parent = this_parent->d_parent;
-#ifdef DCACHE_DEBUG
-printk(KERN_DEBUG "select_parent: ascending to %s/%s, found=%d\n",
-this_parent->d_parent->d_name.name, this_parent->d_name.name, found);
-#endif
                 goto resume;
         }
 out:
@@ -794,11 +789,12 @@ struct dentry *d_alloc_name(struct dentry *parent, const char *name)
  
 void d_instantiate(struct dentry *entry, struct inode * inode)
 {
-        if (!list_empty(&entry->d_alias)) BUG();
+        BUG_ON(!list_empty(&entry->d_alias));
         spin_lock(&dcache_lock);
         if (inode)
                 list_add(&entry->d_alias, &inode->i_dentry);
         entry->d_inode = inode;
+        fsnotify_d_instantiate(entry, inode);
         spin_unlock(&dcache_lock);
         security_d_instantiate(entry, inode);
 }
@@ -850,6 +846,7 @@ struct dentry *d_instantiate_unique(struct dentry *entry, struct inode *inode)
         list_add(&entry->d_alias, &inode->i_dentry);
 do_negative:
         entry->d_inode = inode;
+        fsnotify_d_instantiate(entry, inode);
         spin_unlock(&dcache_lock);
         security_d_instantiate(entry, inode);
         return NULL;
@@ -980,6 +977,7 @@ struct dentry *d_splice_alias(struct inode *inode, struct dentry *dentry)
                 new = __d_find_alias(inode, 1);
                 if (new) {
                         BUG_ON(!(new->d_flags & DCACHE_DISCONNECTED));
+                        fsnotify_d_instantiate(new, inode);
                         spin_unlock(&dcache_lock);
                         security_d_instantiate(new, inode);
                         d_rehash(dentry);
@@ -989,6 +987,7 @@ struct dentry *d_splice_alias(struct inode *inode, struct dentry *dentry)
                         /* d_instantiate takes dcache_lock, so we do it by hand */
                         list_add(&dentry->d_alias, &inode->i_dentry);
                         dentry->d_inode = inode;
+                        fsnotify_d_instantiate(dentry, inode);
                         spin_unlock(&dcache_lock);
                         security_d_instantiate(dentry, inode);
                         d_rehash(dentry);
@@ -1173,6 +1172,9 @@ void d_delete(struct dentry * dentry)
         spin_lock(&dentry->d_lock);
         isdir = S_ISDIR(dentry->d_inode->i_mode);
         if (atomic_read(&dentry->d_count) == 1) {
+                /* remove this and other inotify debug checks after 2.6.18 */
+                dentry->d_flags &= ~DCACHE_INOTIFY_PARENT_WATCHED;
+
                 dentry_iput(dentry);
                 fsnotify_nameremove(dentry, isdir);
                 return;
@@ -1339,6 +1341,7 @@ already_unhashed:
 
         list_add(&dentry->d_u.d_child, &dentry->d_parent->d_subdirs);
         spin_unlock(&target->d_lock);
+        fsnotify_d_move(dentry);
         spin_unlock(&dentry->d_lock);
         write_sequnlock(&rename_lock);
         spin_unlock(&dcache_lock);
@@ -1682,7 +1685,8 @@ static void __init dcache_init(unsigned long mempages)
         dentry_cache = kmem_cache_create("dentry_cache",
                                          sizeof(struct dentry),
                                          0,
-                                         SLAB_RECLAIM_ACCOUNT|SLAB_PANIC,
+                                         (SLAB_RECLAIM_ACCOUNT|SLAB_PANIC|
+                                         SLAB_MEM_SPREAD),
                                          NULL, NULL);
         
         set_shrinker(DEFAULT_SEEKS, shrink_dcache_memory);
@@ -1706,10 +1710,10 @@ static void __init dcache_init(unsigned long mempages)
 }
 
 /* SLAB cache for __getname() consumers */
-kmem_cache_t *names_cachep;
+kmem_cache_t *names_cachep __read_mostly;
 
 /* SLAB cache for file structures */
-kmem_cache_t *filp_cachep;
+kmem_cache_t *filp_cachep __read_mostly;
 
 EXPORT_SYMBOL(d_genocide);