ocfs: constify xattr_handler

[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 c75b533..b958ad5 100644 (file)
--- a/fs/ceph/mon_client.h
+++ b/fs/ceph/mon_client.h
@@ -2,7 +2,7 @@
 #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"
@@ -45,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;
@@ -61,6 +62,7 @@ struct ceph_mon_client {
 
        struct ceph_auth_client *auth;
        struct ceph_msg *m_auth;
+       int pending_auth;
 
        bool hunting;
        int cur_mon;                       /* last monitor i contacted */
@@ -74,7 +76,7 @@ struct ceph_mon_client {
        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;
 
@@ -110,6 +112,8 @@ extern int ceph_monc_do_statfs(struct ceph_mon_client *monc,
 
 extern int ceph_monc_open_session(struct ceph_mon_client *monc);
 
+extern int ceph_monc_validate_auth(struct ceph_mon_client *monc);
+
 
 
 #endif