mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-28 20:02:17 +00:00
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: John Spray <john.spray@redhat.com> Reviewed-by: Sage Weil <sage@redhat.com>
This commit is contained in:
parent
d4e1a4e0db
commit
7cfa0313d0
1 changed files with 5 additions and 2 deletions
|
@ -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;
|
||||
|
|
Loading…
Reference in a new issue