Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 559c1e00 authored by Sage Weil's avatar Sage Weil
Browse files

ceph: include auth method in error messages 



Signed-off-by: default avatarSage Weil <sage@newdream.net>
parent f26e681d

fs/ceph/auth.c

+5 −4
Original line number Diff line number Diff line
@@ -150,7 +150,8 @@ int ceph_build_auth_request(struct ceph_auth_client *ac, 


	ret = ac->ops->build_request(ac, p + sizeof(u32), end);

	if (ret < 0) {

		pr_err("error %d building request\n", ret);

		pr_err("error %d building auth method %s request\n", ret,

		       ac->ops->name);

		return ret;

	}

	dout(" built request %d bytes\n", ret);
@@ -216,8 +217,8 @@ int ceph_handle_auth_reply(struct ceph_auth_client *ac, 
		if (ac->protocol != protocol) {

			ret = ceph_auth_init_protocol(ac, protocol);

			if (ret) {

				pr_err("error %d on auth protocol %d init\n",

				       ret, protocol);

				pr_err("error %d on auth method %s init\n",

				       ret, ac->ops->name);

				goto out;

			}

		}
@@ -229,7 +230,7 @@ int ceph_handle_auth_reply(struct ceph_auth_client *ac, 
	if (ret == -EAGAIN) {

		return ceph_build_auth_request(ac, reply_buf, reply_len);

	} else if (ret) {

		pr_err("authentication error %d\n", ret);

		pr_err("auth method '%s' error %d\n", ac->ops->name, ret);

		return ret;

	}

	return 0;

fs/ceph/auth.h

+2 −0
Original line number Diff line number Diff line
@@ -15,6 +15,8 @@ struct ceph_auth_client; 
struct ceph_authorizer;



struct ceph_auth_client_ops {

	const char *name;



	/*

	 * true if we are authenticated and can connect to

	 * services.

fs/ceph/auth_none.c

+1 −0
Original line number Diff line number Diff line
@@ -94,6 +94,7 @@ static void ceph_auth_none_destroy_authorizer(struct ceph_auth_client *ac, 
}



static const struct ceph_auth_client_ops ceph_auth_none_ops = {

	.name = "none",

	.reset = reset,

	.destroy = destroy,

	.is_authenticated = is_authenticated,

fs/ceph/auth_x.c

+1 −0
Original line number Diff line number Diff line
@@ -618,6 +618,7 @@ static void ceph_x_invalidate_authorizer(struct ceph_auth_client *ac, 




static const struct ceph_auth_client_ops ceph_x_ops = {

	.name = "x",

	.is_authenticated = ceph_x_is_authenticated,

	.build_request = ceph_x_build_request,

	.handle_reply = ceph_x_handle_reply,