diff options
| author |   Ilya Dryomov <idryomov@gmail.com> | 2021-06-21 11:53:38 +0200 |
|---|---|---|
| committer | Ilya Dryomov <idryomov@gmail.com> | 2021-06-24 21:03:16 +0200 |
| commit | 3c0d0894320cc517fda657c69939cd0313d0b4e2 (patch) | |
| tree | 461605c1079ae14df53653e4e424357456bb222c /net/ceph/auth_x.c | |
| parent | ceph: fix error handling in ceph_atomic_open and ceph_lookup (diff) | |
| download | linux-dev-3c0d0894320cc517fda657c69939cd0313d0b4e2.tar.xz linux-dev-3c0d0894320cc517fda657c69939cd0313d0b4e2.zip | |
libceph: don't pass result into ac->ops->handle_reply()
There is no result to pass in msgr2 case because authentication
failures are reported through auth_bad_method frame and in MAuth
case an error is returned immediately.
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
Reviewed-by: Jeff Layton <jlayton@kernel.org>
Diffstat (limited to 'net/ceph/auth_x.c')
| -rw-r--r-- | net/ceph/auth_x.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/net/ceph/auth_x.c b/net/ceph/auth_x.c index 79641c4afee9..cab99c5581b0 100644 --- a/net/ceph/auth_x.c +++ b/net/ceph/auth_x.c @@ -661,7 +661,7 @@ e_inval: return -EINVAL; } -static int ceph_x_handle_reply(struct ceph_auth_client *ac, int result, +static int ceph_x_handle_reply(struct ceph_auth_client *ac, void *buf, void *end, u8 *session_key, int *session_key_len, u8 *con_secret, int *con_secret_len) @@ -669,13 +669,11 @@ static int ceph_x_handle_reply(struct ceph_auth_client *ac, int result, struct ceph_x_info *xi = ac->private; struct ceph_x_ticket_handler *th; int len = end - buf; + int result; void *p; int op; int ret; - if (result) - return result; /* XXX hmm? */ - if (xi->starting) { /* it's a hello */ struct ceph_x_server_challenge *sc = buf; |