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>
This commit is contained in:
Alex Elder
Alex Elder
parent
ed96af6460
commit
6c4a19158b
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -14,6 +14,14 @@
|
|||
struct ceph_auth_client;
|
||||
struct ceph_authorizer;
|
||||
|
||||
struct ceph_auth_handshake {
|
||||
struct ceph_authorizer *authorizer;
|
||||
void *authorizer_buf;
|
||||
size_t authorizer_buf_len;
|
||||
void *authorizer_reply_buf;
|
||||
size_t authorizer_reply_buf_len;
|
||||
};
|
||||
|
||||
struct ceph_auth_client_ops {
|
||||
const char *name;
|
||||
|
||||
|
|
|
|||
|
|
@ -6,9 +6,10 @@
|
|||
#include <linux/mempool.h>
|
||||
#include <linux/rbtree.h>
|
||||
|
||||
#include "types.h"
|
||||
#include "osdmap.h"
|
||||
#include "messenger.h"
|
||||
#include <linux/ceph/types.h>
|
||||
#include <linux/ceph/osdmap.h>
|
||||
#include <linux/ceph/messenger.h>
|
||||
#include <linux/ceph/auth.h>
|
||||
|
||||
/*
|
||||
* Maximum object name size
|
||||
|
|
@ -40,9 +41,7 @@ struct ceph_osd {
|
|||
struct list_head o_requests;
|
||||
struct list_head o_linger_requests;
|
||||
struct list_head o_osd_lru;
|
||||
struct ceph_authorizer *o_authorizer;
|
||||
void *o_authorizer_buf, *o_authorizer_reply_buf;
|
||||
size_t o_authorizer_buf_len, o_authorizer_reply_buf_len;
|
||||
struct ceph_auth_handshake o_auth;
|
||||
unsigned long lru_ttl;
|
||||
int o_marked_for_keepalive;
|
||||
struct list_head o_keepalive_item;
|
||||
|
|
|
|||
|
|
@ -667,8 +667,8 @@ static void put_osd(struct ceph_osd *osd)
|
|||
if (atomic_dec_and_test(&osd->o_ref)) {
|
||||
struct ceph_auth_client *ac = osd->o_osdc->client->monc.auth;
|
||||
|
||||
if (osd->o_authorizer)
|
||||
ac->ops->destroy_authorizer(ac, osd->o_authorizer);
|
||||
if (osd->o_auth.authorizer)
|
||||
ac->ops->destroy_authorizer(ac, osd->o_auth.authorizer);
|
||||
kfree(osd);
|
||||
}
|
||||
}
|
||||
|
|
@ -2117,27 +2117,27 @@ static int get_authorizer(struct ceph_connection *con,
|
|||
struct ceph_auth_client *ac = osdc->client->monc.auth;
|
||||
int ret = 0;
|
||||
|
||||
if (force_new && o->o_authorizer) {
|
||||
ac->ops->destroy_authorizer(ac, o->o_authorizer);
|
||||
o->o_authorizer = NULL;
|
||||
if (force_new && o->o_auth.authorizer) {
|
||||
ac->ops->destroy_authorizer(ac, o->o_auth.authorizer);
|
||||
o->o_auth.authorizer = NULL;
|
||||
}
|
||||
if (o->o_authorizer == NULL) {
|
||||
if (o->o_auth.authorizer == NULL) {
|
||||
ret = ac->ops->create_authorizer(
|
||||
ac, CEPH_ENTITY_TYPE_OSD,
|
||||
&o->o_authorizer,
|
||||
&o->o_authorizer_buf,
|
||||
&o->o_authorizer_buf_len,
|
||||
&o->o_authorizer_reply_buf,
|
||||
&o->o_authorizer_reply_buf_len);
|
||||
&o->o_auth.authorizer,
|
||||
&o->o_auth.authorizer_buf,
|
||||
&o->o_auth.authorizer_buf_len,
|
||||
&o->o_auth.authorizer_reply_buf,
|
||||
&o->o_auth.authorizer_reply_buf_len);
|
||||
if (ret)
|
||||
return ret;
|
||||
}
|
||||
|
||||
*proto = ac->protocol;
|
||||
*buf = o->o_authorizer_buf;
|
||||
*len = o->o_authorizer_buf_len;
|
||||
*reply_buf = o->o_authorizer_reply_buf;
|
||||
*reply_len = o->o_authorizer_reply_buf_len;
|
||||
*buf = o->o_auth.authorizer_buf;
|
||||
*len = o->o_auth.authorizer_buf_len;
|
||||
*reply_buf = o->o_auth.authorizer_reply_buf;
|
||||
*reply_len = o->o_auth.authorizer_reply_buf_len;
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
@ -2148,7 +2148,7 @@ static int verify_authorizer_reply(struct ceph_connection *con, int len)
|
|||
struct ceph_osd_client *osdc = o->o_osdc;
|
||||
struct ceph_auth_client *ac = osdc->client->monc.auth;
|
||||
|
||||
return ac->ops->verify_authorizer_reply(ac, o->o_authorizer, len);
|
||||
return ac->ops->verify_authorizer_reply(ac, o->o_auth.authorizer, len);
|
||||
}
|
||||
|
||||
static int invalidate_authorizer(struct ceph_connection *con)
|
||||
|
|
|
|||
Reference in New Issue