ceph: clean up statfs

[net-next-2.6.git] / fs / ceph / mon_client.h

diff --git a/fs/ceph/mon_client.h b/fs/ceph/mon_client.h
index b958ad5afa061e92a0031a0fd03ac77433dbd17d..cc89a86c8589c135bb043b6acea00a94ee17b096 100644 (file)
--- a/fs/ceph/mon_client.h
+++ b/fs/ceph/mon_client.h
@@ -2,6 +2,7 @@
 #define _FS_CEPH_MON_CLIENT_H
 
 #include <linux/completion.h>
+#include <linux/kref.h>
 #include <linux/rbtree.h>
 
 #include "messenger.h"
@@ -44,13 +45,14 @@ struct ceph_mon_request {
  * to the caller
  */
 struct ceph_mon_statfs_request {
+       struct kref kref;
        u64 tid;
        struct rb_node node;
        int result;
        struct ceph_statfs *buf;
        struct completion completion;
-       unsigned long last_attempt, delay; /* jiffies */
        struct ceph_msg *request;  /* original request */
+       struct ceph_msg *reply;    /* and reply */
 };
 
 struct ceph_mon_client {
@@ -72,7 +74,6 @@ struct ceph_mon_client {
 
        /* msg pools */
        struct ceph_msgpool msgpool_subscribe_ack;
-       struct ceph_msgpool msgpool_statfs_reply;
        struct ceph_msgpool msgpool_auth_reply;
 
        /* pending statfs requests */