Commit 0dde5848 authored by Ilya Dryomov's avatar Ilya Dryomov
Browse files

libceph: drop len argument of *verify_authorizer_reply() 



The length of the reply is protocol-dependent - for cephx it's
ceph_x_authorize_reply.  Nothing sensible can be passed from the
messenger layer anyway.

Signed-off-by: default avatarIlya Dryomov <idryomov@gmail.com>
Reviewed-by: default avatarSage Weil <sage@redhat.com>
parent 5c056fdc

fs/ceph/mds_client.c

+2 −2
Original line number Diff line number Diff line
@@ -3943,13 +3943,13 @@ static struct ceph_auth_handshake *get_authorizer(struct ceph_connection *con, 
}





static int verify_authorizer_reply(struct ceph_connection *con, int len)

static int verify_authorizer_reply(struct ceph_connection *con)

{

	struct ceph_mds_session *s = con->private;

	struct ceph_mds_client *mdsc = s->s_mdsc;

	struct ceph_auth_client *ac = mdsc->fsc->client->monc.auth;



	return ceph_auth_verify_authorizer_reply(ac, s->s_auth.authorizer, len);

	return ceph_auth_verify_authorizer_reply(ac, s->s_auth.authorizer);

}



static int invalidate_authorizer(struct ceph_connection *con)

include/linux/ceph/auth.h

+2 −3
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ struct ceph_auth_client_ops { 
	int (*update_authorizer)(struct ceph_auth_client *ac, int peer_type,

				 struct ceph_auth_handshake *auth);

	int (*verify_authorizer_reply)(struct ceph_auth_client *ac,

				       struct ceph_authorizer *a, size_t len);

				       struct ceph_authorizer *a);

	void (*invalidate_authorizer)(struct ceph_auth_client *ac,

				      int peer_type);
@@ -118,8 +118,7 @@ extern int ceph_auth_update_authorizer(struct ceph_auth_client *ac, 
				       int peer_type,

				       struct ceph_auth_handshake *a);

extern int ceph_auth_verify_authorizer_reply(struct ceph_auth_client *ac,

					     struct ceph_authorizer *a,

					     size_t len);

					     struct ceph_authorizer *a);

extern void ceph_auth_invalidate_authorizer(struct ceph_auth_client *ac,

					    int peer_type);

include/linux/ceph/messenger.h

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ struct ceph_connection_operations { 
	struct ceph_auth_handshake *(*get_authorizer) (

				struct ceph_connection *con,

			       int *proto, int force_new);

	int (*verify_authorizer_reply) (struct ceph_connection *con, int len);

	int (*verify_authorizer_reply) (struct ceph_connection *con);

	int (*invalidate_authorizer)(struct ceph_connection *con);



	/* there was some error on the socket (disconnect, whatever) */

net/ceph/auth.c

+2 −2
Original line number Diff line number Diff line
@@ -315,13 +315,13 @@ int ceph_auth_update_authorizer(struct ceph_auth_client *ac, 
EXPORT_SYMBOL(ceph_auth_update_authorizer);



int ceph_auth_verify_authorizer_reply(struct ceph_auth_client *ac,

				      struct ceph_authorizer *a, size_t len)

				      struct ceph_authorizer *a)

{

	int ret = 0;



	mutex_lock(&ac->mutex);

	if (ac->ops && ac->ops->verify_authorizer_reply)

		ret = ac->ops->verify_authorizer_reply(ac, a, len);

		ret = ac->ops->verify_authorizer_reply(ac, a);

	mutex_unlock(&ac->mutex);

	return ret;

}

net/ceph/auth_x.c

+1 −1
Original line number Diff line number Diff line
@@ -623,7 +623,7 @@ static int ceph_x_update_authorizer( 
}



static int ceph_x_verify_authorizer_reply(struct ceph_auth_client *ac,

					  struct ceph_authorizer *a, size_t len)

					  struct ceph_authorizer *a)

{

	struct ceph_x_authorizer *au = (void *)a;

	void *p = au->enc_buf;

CRA Git | Maintained and supported by SUSTech CRA and CCSE