summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorAlex Elder <elder@inktank.com>2012-05-16 15:16:39 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-11-26 11:38:08 -0800
commited35fbcd3cf73dfbff59bf8c20c772925562bc45 (patch)
tree7a93030aa0bd809eb111d339cd82a0c29b32be74 /fs
parent4f33c7ed3796a5078cd9eef0d3af4ebf8f7e1b99 (diff)
downloadlinux-3.10-ed35fbcd3cf73dfbff59bf8c20c772925562bc45.tar.gz
linux-3.10-ed35fbcd3cf73dfbff59bf8c20c772925562bc45.tar.bz2
linux-3.10-ed35fbcd3cf73dfbff59bf8c20c772925562bc45.zip
ceph: use info returned by get_authorizer
(cherry picked from commit 8f43fb53894079bf0caab6e348ceaffe7adc651a) Rather than passing a bunch of arguments to be filled in with the content of the ceph_auth_handshake buffer now returned by the get_authorizer method, just use the returned information in the caller, and drop the unnecessary arguments. Signed-off-by: Alex Elder <elder@inktank.com> Reviewed-by: Sage Weil <sage@inktank.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs')
-rw-r--r--fs/ceph/mds_client.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c
index 67938a9d049..200bc87eceb 100644
--- a/fs/ceph/mds_client.c
+++ b/fs/ceph/mds_client.c
@@ -3401,9 +3401,7 @@ out:
* managed separately. Caller must *not* attempt to free it.
*/
static struct ceph_auth_handshake *get_authorizer(struct ceph_connection *con,
- void **buf, int *len, int *proto,
- void **reply_buf, int *reply_len,
- int force_new)
+ int *proto, int force_new)
{
struct ceph_mds_session *s = con->private;
struct ceph_mds_client *mdsc = s->s_mdsc;
@@ -3421,12 +3419,7 @@ static struct ceph_auth_handshake *get_authorizer(struct ceph_connection *con,
if (ret)
return ERR_PTR(ret);
}
-
*proto = ac->protocol;
- *buf = auth->authorizer_buf;
- *len = auth->authorizer_buf_len;
- *reply_buf = auth->authorizer_reply_buf;
- *reply_len = auth->authorizer_reply_buf_len;
return auth;
}