dcache: convert to use new lru list infrastructure

[linux-2.6-block.git] / include / linux / fs.h

diff --git a/include/linux/fs.h b/include/linux/fs.h
index e04786569c2828d74ba4eaf86e4b354ce438abd0..36e45df87f6eca94f5b5c56af5fd696c5cf57b4c 100644 (file)
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -1270,14 +1270,6 @@ struct super_block {
        struct list_head        s_files;
 #endif
        struct list_head        s_mounts;       /* list of mounts; _not_ for fs use */
-
-       /* s_dentry_lru_lock protects s_dentry_lru and s_nr_dentry_unused */
-       spinlock_t              s_dentry_lru_lock ____cacheline_aligned_in_smp;
-       struct list_head        s_dentry_lru;   /* unused dentry lru */
-       long                    s_nr_dentry_unused;     /* # of dentry on lru */
-
-       struct list_lru         s_inode_lru ____cacheline_aligned_in_smp;
-
        struct block_device     *s_bdev;
        struct backing_dev_info *s_bdi;
        struct mtd_info         *s_mtd;
@@ -1331,6 +1323,13 @@ struct super_block {
 
        /* AIO completions deferred from interrupt context */
        struct workqueue_struct *s_dio_done_wq;
+
+       /*
+        * Keep the lru lists last in the structure so they always sit on their
+        * own individual cachelines.
+        */
+       struct list_lru         s_dentry_lru ____cacheline_aligned_in_smp;
+       struct list_lru         s_inode_lru ____cacheline_aligned_in_smp;
 };
 
 extern struct timespec current_fs_time(struct super_block *sb);