xfs: modify buffer item reference counting

[safe/jmp/linux-2.6] / fs / ceph / mon_client.h

diff --git a/fs/ceph/mon_client.h b/fs/ceph/mon_client.h
index 5258c56..b958ad5 100644 (file)
--- a/fs/ceph/mon_client.h
+++ b/fs/ceph/mon_client.h
@@ -2,13 +2,14 @@
 #define _FS_CEPH_MON_CLIENT_H
 
 #include <linux/completion.h>
-#include <linux/radix-tree.h>
+#include <linux/rbtree.h>
 
 #include "messenger.h"
 #include "msgpool.h"
 
 struct ceph_client;
 struct ceph_mount_args;
+struct ceph_auth_client;
 
 /*
  * The monitor map enumerates the set of all monitors.
@@ -44,6 +45,7 @@ struct ceph_mon_request {
  */
 struct ceph_mon_statfs_request {
        u64 tid;
+       struct rb_node node;
        int result;
        struct ceph_statfs *buf;
        struct completion completion;
@@ -58,27 +60,33 @@ struct ceph_mon_client {
        struct mutex mutex;
        struct delayed_work delayed_work;
 
+       struct ceph_auth_client *auth;
+       struct ceph_msg *m_auth;
+       int pending_auth;
+
        bool hunting;
        int cur_mon;                       /* last monitor i contacted */
        unsigned long sub_sent, sub_renew_after;
        struct ceph_connection *con;
+       bool have_fsid;
 
        /* msg pools */
-       struct ceph_msgpool msgpool_mount_ack;
        struct ceph_msgpool msgpool_subscribe_ack;
        struct ceph_msgpool msgpool_statfs_reply;
+       struct ceph_msgpool msgpool_auth_reply;
 
        /* pending statfs requests */
-       struct radix_tree_root statfs_request_tree;
+       struct rb_root statfs_request_tree;
        int num_statfs_requests;
        u64 last_tid;
 
-       /* mds/osd map or mount requests */
-       bool want_mount;
+       /* mds/osd map */
        int want_next_osdmap; /* 1 = want, 2 = want+asked */
        u32 have_osdmap, have_mdsmap;
 
+#ifdef CONFIG_DEBUG_FS
        struct dentry *debugfs_file;
+#endif
 };
 
 extern struct ceph_monmap *ceph_monmap_decode(void *p, void *end);
@@ -99,11 +107,13 @@ extern int ceph_monc_got_osdmap(struct ceph_mon_client *monc, u32 have);
 
 extern void ceph_monc_request_next_osdmap(struct ceph_mon_client *monc);
 
-extern int ceph_monc_request_mount(struct ceph_mon_client *monc);
-
 extern int ceph_monc_do_statfs(struct ceph_mon_client *monc,
                               struct ceph_statfs *buf);
 
+extern int ceph_monc_open_session(struct ceph_mon_client *monc);
+
+extern int ceph_monc_validate_auth(struct ceph_mon_client *monc);
+
 
 
 #endif