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: Ilya Dryomov <idryomov@gmail.com>
Reviewed-by: Sage Weil <sage@redhat.com>

diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c
index 815acd1a56d461b944c06d117457ccd99c42e2f0..bf4d3d26850cbf8c939227f8d479659bda4b8354 100644 (file)
--- a/fs/ceph/mds_client.c
+++ b/fs/ceph/mds_client.c
@@ -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)

diff --git a/include/linux/ceph/auth.h b/include/linux/ceph/auth.h
index 374bb1c4ef52925a3ce3b55b829587503a0088fa..a6747789fe5c25679d99fcc42b74042ea29251a3 100644 (file)
--- a/include/linux/ceph/auth.h
+++ b/include/linux/ceph/auth.h
@@ -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);
 

diff --git a/include/linux/ceph/messenger.h b/include/linux/ceph/messenger.h
index 8dbd7879fdc6b74719d9cb65b85d8c60f589bde6..531f2d882bd905e5a83c2457d612cafd8a1cd39c 100644 (file)
--- a/include/linux/ceph/messenger.h
+++ b/include/linux/ceph/messenger.h
@@ -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) */

diff --git a/net/ceph/auth.c b/net/ceph/auth.c
index c822b3ae1bd37b2ca9e4708b3d1ed6b7dd66f6c3..48bb8d95195b1df91d3f34d20d815d7021e10693 100644 (file)
--- a/net/ceph/auth.c
+++ b/net/ceph/auth.c
@@ -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;
 }

diff --git a/net/ceph/auth_x.c b/net/ceph/auth_x.c
index b216131915e74a2c160623bb045f8ac0e3971927..2034fb9266700e6b456b141db9b5d264aed77d62 100644 (file)
--- a/net/ceph/auth_x.c
+++ b/net/ceph/auth_x.c
@@ -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;

diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c
index 2efb335deada6048be8c8f3b2c6fe30131fb330d..dba380429a058935d4d3c16560d63eb8e315e0e4 100644 (file)
--- a/net/ceph/messenger.c
+++ b/net/ceph/messenger.c
@@ -2033,7 +2033,7 @@ static int process_connect(struct ceph_connection *con)
                 * should also define ->verify_authorizer_reply().
                 * See get_connect_authorizer().
                 */
-               ret = con->ops->verify_authorizer_reply(con, 0);
+               ret = con->ops->verify_authorizer_reply(con);
                if (ret < 0) {
                        con->error_msg = "bad authorize reply";
                        return ret;

diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c
index e6ae15bc41b74dfc96e9d967139367b4ad3be952..5d812a26f05a9c41e2cbad52a91021b34a7301b7 100644 (file)
--- a/net/ceph/osd_client.c
+++ b/net/ceph/osd_client.c
@@ -4478,13 +4478,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_osd *o = con->private;
        struct ceph_osd_client *osdc = o->o_osdc;
        struct ceph_auth_client *ac = osdc->client->monc.auth;
 
-       return ceph_auth_verify_authorizer_reply(ac, o->o_auth.authorizer, len);
+       return ceph_auth_verify_authorizer_reply(ac, o->o_auth.authorizer);
 }
 
 static int invalidate_authorizer(struct ceph_connection *con)