summaryrefslogtreecommitdiffstats
path: root/fs/ceph/mds_client.h
diff options
context:
space:
mode:
authorAlex Elder <elder@inktank.com>2012-05-16 22:16:38 +0200
committerAlex Elder <elder@dreamhost.com>2012-05-17 15:18:12 +0200
commit6c4a19158b96ea1fb8acbe0c1d5493d9dcd2f147 (patch)
tree5fe6418eb57bf4e84f1eda9606a4a045ff08dcba /fs/ceph/mds_client.h
parentceph: messenger: check return from get_authorizer (diff)
downloadlinux-6c4a19158b96ea1fb8acbe0c1d5493d9dcd2f147.tar.xz
linux-6c4a19158b96ea1fb8acbe0c1d5493d9dcd2f147.zip
ceph: define ceph_auth_handshake type
The definitions for the ceph_mds_session and ceph_osd both contain five fields related only to "authorizers." Encapsulate those fields into their own struct type, allowing for better isolation in some upcoming patches. Fix the #includes in "linux/ceph/osd_client.h" to lay out their more complete canonical path. Signed-off-by: Alex Elder <elder@inktank.com> Reviewed-by: Sage Weil <sage@inktank.com>
Diffstat (limited to 'fs/ceph/mds_client.h')
-rw-r--r--fs/ceph/mds_client.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/ceph/mds_client.h b/fs/ceph/mds_client.h
index 8c7c04ebb595..dd26846dd71d 100644
--- a/fs/ceph/mds_client.h
+++ b/fs/ceph/mds_client.h
@@ -11,6 +11,7 @@
#include <linux/ceph/types.h>
#include <linux/ceph/messenger.h>
#include <linux/ceph/mdsmap.h>
+#include <linux/ceph/auth.h>
/*
* Some lock dependencies:
@@ -113,9 +114,7 @@ struct ceph_mds_session {
struct ceph_connection s_con;
- struct ceph_authorizer *s_authorizer;
- void *s_authorizer_buf, *s_authorizer_reply_buf;
- size_t s_authorizer_buf_len, s_authorizer_reply_buf_len;
+ struct ceph_auth_handshake s_auth;
/* protected by s_gen_ttl_lock */
spinlock_t s_gen_ttl_lock;