Merge to Fedora kernel-2.6.7-1.492

[linux-2.6.git] / fs / dcache.c

diff --git a/fs/dcache.c b/fs/dcache.c
index cf32eb2..1ab2caf 100644 (file)
--- a/fs/dcache.c
+++ b/fs/dcache.c
@@ -30,10 +30,12 @@
 #include <linux/security.h>
 #include <linux/seqlock.h>
 #include <linux/swap.h>
+#include <linux/bootmem.h>
 
-#define DCACHE_PARANOIA 1
 /* #define DCACHE_DEBUG 1 */
 
+int sysctl_vfs_cache_pressure = 100;
+
 spinlock_t dcache_lock __cacheline_aligned_in_smp = SPIN_LOCK_UNLOCKED;
 seqlock_t rename_lock __cacheline_aligned_in_smp = SEQLOCK_UNLOCKED;
 
@@ -67,9 +69,9 @@ struct dentry_stat_t dentry_stat = {
        .age_limit = 45,
 };
 
-static void d_callback(void *arg)
+static void d_callback(struct rcu_head *head)
 {
-       struct dentry * dentry = (struct dentry *)arg;
+       struct dentry * dentry = container_of(head, struct dentry, d_rcu);
 
        if (dname_external(dentry))
                kfree(dentry->d_name.name);
@@ -84,11 +86,7 @@ static void d_free(struct dentry *dentry)
 {
        if (dentry->d_op && dentry->d_op->d_release)
                dentry->d_op->d_release(dentry);
-       if (dentry->d_extra_attributes) {
-               kfree(dentry->d_extra_attributes);
-               dentry->d_extra_attributes = NULL;
-       }
-       call_rcu(&dentry->d_rcu, d_callback, dentry);
+       call_rcu(&dentry->d_rcu, d_callback);
 }
 
 /*
@@ -384,6 +382,8 @@ static void prune_dcache(int count)
                struct dentry *dentry;
                struct list_head *tmp;
 
+               cond_resched_lock(&dcache_lock);
+
                tmp = dentry_unused.prev;
                if (tmp == &dentry_unused)
                        break;
@@ -670,7 +670,7 @@ static int shrink_dcache_memory(int nr, unsigned int gfp_mask)
                        return -1;
                prune_dcache(nr);
        }
-       return dentry_stat.nr_unused;
+       return (dentry_stat.nr_unused / 100) * sysctl_vfs_cache_pressure;
 }
 
 /**
@@ -729,7 +729,6 @@ struct dentry *d_alloc(struct dentry * parent, const struct qstr *name)
        dentry->d_sb = NULL;
        dentry->d_op = NULL;
        dentry->d_fsdata = NULL;
-       dentry->d_extra_attributes = NULL;
        dentry->d_mounted = 0;
        dentry->d_cookie = NULL;
        dentry->d_bucket = NULL;
@@ -1252,16 +1251,6 @@ already_unhashed:
        /* Unhash the target: dput() will then get rid of it */
        __d_drop(target);
 
-       /* flush any possible attributes */
-       if (dentry->d_extra_attributes) {
-               kfree(dentry->d_extra_attributes);
-               dentry->d_extra_attributes = NULL;
-       }
-       if (target->d_extra_attributes) {
-               kfree(target->d_extra_attributes);
-               target->d_extra_attributes = NULL;
-       }
-
        list_del(&dentry->d_child);
        list_del(&target->d_child);
 
@@ -1306,7 +1295,7 @@ already_unhashed:
  *
  * "buflen" should be positive. Caller holds the dcache_lock.
  */
-char * __d_path( struct dentry *dentry, struct vfsmount *vfsmnt,
+static char * __d_path( struct dentry *dentry, struct vfsmount *vfsmnt,
                        struct dentry *root, struct vfsmount *rootmnt,
                        char *buffer, int buflen)
 {
@@ -1374,8 +1363,6 @@ Elong:
        return ERR_PTR(-ENAMETOOLONG);
 }
 
-EXPORT_SYMBOL_GPL(__d_path);
-
 /* write full pathname into buffer and return start of pathname */
 char * d_path(struct dentry *dentry, struct vfsmount *vfsmnt,
                                char *buf, int buflen)
@@ -1594,30 +1581,25 @@ static int __init set_dhash_entries(char *str)
 }
 __setup("dhash_entries=", set_dhash_entries);
 
-void flush_dentry_attributes (void)
+static void __init dcache_init_early(void)
 {
-       struct hlist_node *tmp;
-       struct dentry *dentry;
-       int i;
-
-       spin_lock(&dcache_lock);
-       for (i = 0; i <= d_hash_mask; i++)
-               hlist_for_each_entry(dentry, tmp, dentry_hashtable+i, d_hash) {
-                       kfree(dentry->d_extra_attributes);
-                       dentry->d_extra_attributes = NULL;
-               }
-       spin_unlock(&dcache_lock);
+       int loop;
+
+       dentry_hashtable =
+               alloc_large_system_hash("Dentry cache",
+                                       sizeof(struct hlist_head),
+                                       dhash_entries,
+                                       13,
+                                       0,
+                                       &d_hash_shift,
+                                       &d_hash_mask);
+
+       for (loop = 0; loop < (1 << d_hash_shift); loop++)
+               INIT_HLIST_HEAD(&dentry_hashtable[loop]);
 }
 
-EXPORT_SYMBOL_GPL(flush_dentry_attributes);
-
 static void __init dcache_init(unsigned long mempages)
 {
-       struct hlist_head *d;
-       unsigned long order;
-       unsigned int nr_hash;
-       int i;
-
        /* 
         * A constructor could be added for stable state like the lists,
         * but it is probably not worth it because of the cache nature
@@ -1630,48 +1612,6 @@ static void __init dcache_init(unsigned long mempages)
                                         NULL, NULL);
        
        set_shrinker(DEFAULT_SEEKS, shrink_dcache_memory);
-
-       if (!dhash_entries)
-               dhash_entries = PAGE_SHIFT < 13 ?
-                               mempages >> (13 - PAGE_SHIFT) :
-                               mempages << (PAGE_SHIFT - 13);
-
-       dhash_entries *= sizeof(struct hlist_head);
-       for (order = 0; ((1UL << order) << PAGE_SHIFT) < dhash_entries; order++)
-               ;
-               
-       if (order > 5)
-               order = 5;
-
-       do {
-               unsigned long tmp;
-
-               nr_hash = (1UL << order) * PAGE_SIZE /
-                       sizeof(struct hlist_head);
-               d_hash_mask = (nr_hash - 1);
-
-               tmp = nr_hash;
-               d_hash_shift = 0;
-               while ((tmp >>= 1UL) != 0UL)
-                       d_hash_shift++;
-
-               dentry_hashtable = (struct hlist_head *)
-                       __get_free_pages(GFP_ATOMIC, order);
-       } while (dentry_hashtable == NULL && --order >= 0);
-
-       printk(KERN_INFO "Dentry cache hash table entries: %d (order: %ld, %ld bytes)\n",
-                       nr_hash, order, (PAGE_SIZE << order));
-
-       if (!dentry_hashtable)
-               panic("Failed to allocate dcache hash table\n");
-
-       d = dentry_hashtable;
-       i = nr_hash;
-       do {
-               INIT_HLIST_HEAD(d);
-               d++;
-               i--;
-       } while (i);
 }
 
 /* SLAB cache for __getname() consumers */
@@ -1685,6 +1625,12 @@ EXPORT_SYMBOL(d_genocide);
 extern void bdev_cache_init(void);
 extern void chrdev_init(void);
 
+void __init vfs_caches_init_early(void)
+{
+       dcache_init_early();
+       inode_init_early();
+}
+
 void __init vfs_caches_init(unsigned long mempages)
 {
        unsigned long reserve;