diff options
Diffstat (limited to 'fs/ceph/auth.c')
-rw-r--r-- | fs/ceph/auth.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/fs/ceph/auth.c b/fs/ceph/auth.c index 9f46de2ba7a7..89490beaf537 100644 --- a/fs/ceph/auth.c +++ b/fs/ceph/auth.c | |||
@@ -1,7 +1,6 @@ | |||
1 | #include "ceph_debug.h" | 1 | #include "ceph_debug.h" |
2 | 2 | ||
3 | #include <linux/module.h> | 3 | #include <linux/module.h> |
4 | #include <linux/slab.h> | ||
5 | #include <linux/err.h> | 4 | #include <linux/err.h> |
6 | #include <linux/slab.h> | 5 | #include <linux/slab.h> |
7 | 6 | ||
@@ -217,8 +216,8 @@ int ceph_handle_auth_reply(struct ceph_auth_client *ac, | |||
217 | if (ac->protocol != protocol) { | 216 | if (ac->protocol != protocol) { |
218 | ret = ceph_auth_init_protocol(ac, protocol); | 217 | ret = ceph_auth_init_protocol(ac, protocol); |
219 | if (ret) { | 218 | if (ret) { |
220 | pr_err("error %d on auth method %s init\n", | 219 | pr_err("error %d on auth protocol %d init\n", |
221 | ret, ac->ops->name); | 220 | ret, protocol); |
222 | goto out; | 221 | goto out; |
223 | } | 222 | } |
224 | } | 223 | } |
@@ -247,7 +246,7 @@ int ceph_build_auth(struct ceph_auth_client *ac, | |||
247 | if (!ac->protocol) | 246 | if (!ac->protocol) |
248 | return ceph_auth_build_hello(ac, msg_buf, msg_len); | 247 | return ceph_auth_build_hello(ac, msg_buf, msg_len); |
249 | BUG_ON(!ac->ops); | 248 | BUG_ON(!ac->ops); |
250 | if (!ac->ops->is_authenticated(ac)) | 249 | if (ac->ops->should_authenticate(ac)) |
251 | return ceph_build_auth_request(ac, msg_buf, msg_len); | 250 | return ceph_build_auth_request(ac, msg_buf, msg_len); |
252 | return 0; | 251 | return 0; |
253 | } | 252 | } |