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>

2 files changed, 18 insertions, 19 deletions

diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c
index 89971e137aab..42013c620488 100644
--- a/fs/ceph/mds_client.c
+++ b/fs/ceph/mds_client.c
@@ -334,10 +334,10 @@ void ceph_put_mds_session(struct ceph_mds_session *s)
         dout("mdsc put_session %p %d -> %d\n", s,
              atomic_read(&s->s_ref), atomic_read(&s->s_ref)-1);
         if (atomic_dec_and_test(&s->s_ref)) {
-                if (s->s_authorizer)
+                if (s->s_auth.authorizer)
                      s->s_mdsc->fsc->client->monc.auth->ops->destroy_authorizer(
                              s->s_mdsc->fsc->client->monc.auth,
-                             s->s_authorizer);
+                             s->s_auth.authorizer);
                 kfree(s);
         }
 }
@@ -3404,29 +3404,29 @@ static int get_authorizer(struct ceph_connection *con,
         struct ceph_auth_client *ac = mdsc->fsc->client->monc.auth;
         int ret = 0;
 
-        if (force_new && s->s_authorizer) {
-                ac->ops->destroy_authorizer(ac, s->s_authorizer);
-                s->s_authorizer = NULL;
+        if (force_new && s->s_auth.authorizer) {
+                ac->ops->destroy_authorizer(ac, s->s_auth.authorizer);
+                s->s_auth.authorizer = NULL;
         }
-        if (s->s_authorizer == NULL) {
+        if (s->s_auth.authorizer == NULL) {
                 if (ac->ops->create_authorizer) {
                         ret = ac->ops->create_authorizer(
                                 ac, CEPH_ENTITY_TYPE_MDS,
-                                &s->s_authorizer,
-                                &s->s_authorizer_buf,
-                                &s->s_authorizer_buf_len,
-                                &s->s_authorizer_reply_buf,
-                                &s->s_authorizer_reply_buf_len);
+                                &s->s_auth.authorizer,
+                                &s->s_auth.authorizer_buf,
+                                &s->s_auth.authorizer_buf_len,
+                                &s->s_auth.authorizer_reply_buf,
+                                &s->s_auth.authorizer_reply_buf_len);
                         if (ret)
                                 return ret;
                 }
         }
 
         *proto = ac->protocol;
-        *buf = s->s_authorizer_buf;
-        *len = s->s_authorizer_buf_len;
-        *reply_buf = s->s_authorizer_reply_buf;
-        *reply_len = s->s_authorizer_reply_buf_len;
+        *buf = s->s_auth.authorizer_buf;
+        *len = s->s_auth.authorizer_buf_len;
+        *reply_buf = s->s_auth.authorizer_reply_buf;
+        *reply_len = s->s_auth.authorizer_reply_buf_len;
         return 0;
 }
 
@@ -3437,7 +3437,7 @@ static int verify_authorizer_reply(struct ceph_connection *con, int len)
         struct ceph_mds_client *mdsc = s->s_mdsc;
         struct ceph_auth_client *ac = mdsc->fsc->client->monc.auth;
 
-        return ac->ops->verify_authorizer_reply(ac, s->s_authorizer, len);
+        return ac->ops->verify_authorizer_reply(ac, s->s_auth.authorizer, len);
 }
 
 static int invalidate_authorizer(struct ceph_connection *con)
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;