Commit fba97e80 authored by Xiubo Li's avatar Xiubo Li Committed by Ilya Dryomov
Browse files

ceph: make ceph_create_session_msg a global symbol 



Signed-off-by: default avatarXiubo Li <xiubli@redhat.com>
Reviewed-by: default avatarJeff Layton <jlayton@kernel.org>
Signed-off-by: default avatarIlya Dryomov <idryomov@gmail.com>
parent ce3a8732

fs/ceph/mds_client.c

+9 −7
Original line number Diff line number Diff line
@@ -1155,7 +1155,7 @@ static int __choose_mds(struct ceph_mds_client *mdsc, 
/*

 * session messages

 */

static struct ceph_msg *create_session_msg(u32 op, u64 seq)

struct ceph_msg *ceph_create_session_msg(u32 op, u64 seq)

{

	struct ceph_msg *msg;

	struct ceph_mds_session_head *h;
@@ -1163,7 +1163,8 @@ static struct ceph_msg *create_session_msg(u32 op, u64 seq) 
	msg = ceph_msg_new(CEPH_MSG_CLIENT_SESSION, sizeof(*h), GFP_NOFS,

			   false);

	if (!msg) {

		pr_err("create_session_msg ENOMEM creating msg\n");

		pr_err("ENOMEM creating session %s msg\n",

		       ceph_session_op_name(op));

		return NULL;

	}

	h = msg->front.iov_base;
@@ -1294,7 +1295,7 @@ static struct ceph_msg *create_session_open_msg(struct ceph_mds_client *mdsc, u6 
	msg = ceph_msg_new(CEPH_MSG_CLIENT_SESSION, sizeof(*h) + extra_bytes,

			   GFP_NOFS, false);

	if (!msg) {

		pr_err("create_session_msg ENOMEM creating msg\n");

		pr_err("ENOMEM creating session open msg\n");

		return ERR_PTR(-ENOMEM);

	}

	p = msg->front.iov_base;
@@ -1803,7 +1804,7 @@ static int send_renew_caps(struct ceph_mds_client *mdsc, 


	dout("send_renew_caps to mds%d (%s)\n", session->s_mds,

		ceph_mds_state_name(state));

	msg = create_session_msg(CEPH_SESSION_REQUEST_RENEWCAPS,

	msg = ceph_create_session_msg(CEPH_SESSION_REQUEST_RENEWCAPS,

				      ++session->s_renew_seq);

	if (!msg)

		return -ENOMEM;
@@ -1818,7 +1819,7 @@ static int send_flushmsg_ack(struct ceph_mds_client *mdsc, 


	dout("send_flushmsg_ack to mds%d (%s)s seq %lld\n",

	     session->s_mds, ceph_session_state_name(session->s_state), seq);

	msg = create_session_msg(CEPH_SESSION_FLUSHMSG_ACK, seq);

	msg = ceph_create_session_msg(CEPH_SESSION_FLUSHMSG_ACK, seq);

	if (!msg)

		return -ENOMEM;

	ceph_con_send(&session->s_con, msg);
@@ -1870,7 +1871,8 @@ static int request_close_session(struct ceph_mds_session *session) 
	dout("request_close_session mds%d state %s seq %lld\n",

	     session->s_mds, ceph_session_state_name(session->s_state),

	     session->s_seq);

	msg = create_session_msg(CEPH_SESSION_REQUEST_CLOSE, session->s_seq);

	msg = ceph_create_session_msg(CEPH_SESSION_REQUEST_CLOSE,

				      session->s_seq);

	if (!msg)

		return -ENOMEM;

	ceph_con_send(&session->s_con, msg);

fs/ceph/mds_client.h

+1 −0
Original line number Diff line number Diff line
@@ -522,6 +522,7 @@ static inline void ceph_mdsc_put_request(struct ceph_mds_request *req) 
	kref_put(&req->r_kref, ceph_mdsc_release_request);

}



extern struct ceph_msg *ceph_create_session_msg(u32 op, u64 seq);

extern void __ceph_queue_cap_release(struct ceph_mds_session *session,

				    struct ceph_cap *cap);

extern void ceph_flush_cap_releases(struct ceph_mds_client *mdsc,