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

Commit 7cfa0313 authored by John Spray's avatar John Spray Committed by Ilya Dryomov
Browse files

ceph: message versioning fixes 

There were two places we were assigning version in host byte order
instead of network byte order.

Also in MSG_CLIENT_SESSION we weren't setting compat_version in the
header to reflect continued compatability with older MDSs.

Fixes: http://tracker.ceph.com/issues/9945



Signed-off-by: default avatarJohn Spray <john.spray@redhat.com>
Reviewed-by: default avatarSage Weil <sage@redhat.com>
parent d4e1a4e0

fs/ceph/mds_client.c

+5 −2
Original line number Diff line number Diff line
@@ -860,8 +860,11 @@ static struct ceph_msg *create_session_open_msg(struct ceph_mds_client *mdsc, u6 
	/*

	 * Serialize client metadata into waiting buffer space, using

	 * the format that userspace expects for map<string, string>

	 *

	 * ClientSession messages with metadata are v2

	 */

	msg->hdr.version = 2;  /* ClientSession messages with metadata are v2 */

	msg->hdr.version = cpu_to_le16(2);

	msg->hdr.compat_version = cpu_to_le16(1);



	/* The write pointer, following the session_head structure */

	p = msg->front.iov_base + sizeof(*h);
@@ -1872,7 +1875,7 @@ static struct ceph_msg *create_request_message(struct ceph_mds_client *mdsc, 
		goto out_free2;

	}



	msg->hdr.version = 2;

	msg->hdr.version = cpu_to_le16(2);

	msg->hdr.tid = cpu_to_le64(req->r_tid);



	head = msg->front.iov_base;