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

Commit 29a9faa6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client 

Pull Ceph fixes from Sage Weil:
 "There are two small messenger bug fixes and a log spam regression fix"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
  libceph: don't spam dmesg with stray reply warnings
  libceph: use the right footer size when skipping a message
  libceph: don't bail early from try_read() when skipping a message
parents c213341e cd8140c6

net/ceph/messenger.c

+11 −4
Original line number Diff line number Diff line
@@ -1197,6 +1197,13 @@ static bool ceph_msg_data_advance(struct ceph_msg_data_cursor *cursor, 
	return new_piece;

}



static size_t sizeof_footer(struct ceph_connection *con)

{

	return (con->peer_features & CEPH_FEATURE_MSG_AUTH) ?

	    sizeof(struct ceph_msg_footer) :

	    sizeof(struct ceph_msg_footer_old);

}



static void prepare_message_data(struct ceph_msg *msg, u32 data_len)

{

	BUG_ON(!msg);
@@ -2335,9 +2342,9 @@ static int read_partial_message(struct ceph_connection *con) 
			ceph_pr_addr(&con->peer_addr.in_addr),

			seq, con->in_seq + 1);

		con->in_base_pos = -front_len - middle_len - data_len -

			sizeof(m->footer);

			sizeof_footer(con);

		con->in_tag = CEPH_MSGR_TAG_READY;

		return 0;

		return 1;

	} else if ((s64)seq - (s64)con->in_seq > 1) {

		pr_err("read_partial_message bad seq %lld expected %lld\n",

		       seq, con->in_seq + 1);
@@ -2360,10 +2367,10 @@ static int read_partial_message(struct ceph_connection *con) 
			/* skip this message */

			dout("alloc_msg said skip message\n");

			con->in_base_pos = -front_len - middle_len - data_len -

				sizeof(m->footer);

				sizeof_footer(con);

			con->in_tag = CEPH_MSGR_TAG_READY;

			con->in_seq++;

			return 0;

			return 1;

		}



		BUG_ON(!con->in_msg);

net/ceph/osd_client.c

+2 −2
Original line number Diff line number Diff line
@@ -2853,8 +2853,8 @@ static struct ceph_msg *get_reply(struct ceph_connection *con, 
	mutex_lock(&osdc->request_mutex);

	req = __lookup_request(osdc, tid);

	if (!req) {

		pr_warn("%s osd%d tid %llu unknown, skipping\n",

			__func__, osd->o_osd, tid);

		dout("%s osd%d tid %llu unknown, skipping\n", __func__,

		     osd->o_osd, tid);

		m = NULL;

		*skip = 1;

		goto out;