Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[linux-2.6-microblaze.git] / fs / ceph / super.h

diff --git a/fs/ceph/super.h b/fs/ceph/super.h
index 5a6cdd3..4c3c964 100644 (file)
--- a/fs/ceph/super.h
+++ b/fs/ceph/super.h
@@ -101,6 +101,8 @@ struct ceph_mount_options {
 struct ceph_fs_client {
        struct super_block *sb;
 
+       struct list_head metric_wakeup;
+
        struct ceph_mount_options *mount_options;
        struct ceph_client *client;
 
@@ -116,8 +118,6 @@ struct ceph_fs_client {
 
        struct ceph_mds_client *mdsc;
 
-       /* writeback */
-       mempool_t *wb_pagevec_pool;
        atomic_long_t writeback_count;
 
        struct workqueue_struct *inode_wq;
@@ -353,7 +353,7 @@ struct ceph_inode_info {
        unsigned i_dirty_caps, i_flushing_caps;     /* mask of dirtied fields */
 
        /*
-        * Link to the the auth cap's session's s_cap_dirty list. s_cap_dirty
+        * Link to the auth cap's session's s_cap_dirty list. s_cap_dirty
         * is protected by the mdsc->cap_dirty_lock, but each individual item
         * is also protected by the inode's i_ceph_lock. Walking s_cap_dirty
         * requires the mdsc->cap_dirty_lock. List presence for an item can