From 2a735132b73139caf0db1ecd3ba3ecef7095c80f Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Tue, 11 May 2010 15:01:51 -0700
Subject: [PATCH] --- yaml --- r: 190808 b: refs/heads/master c:
 45c6ceb547ad2d98215351974a4686bf8cb13e14 h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/fs/ceph/messenger.c | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 85216ecb9ad8..c74313387e49 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9abf82b8bc93dd904738a71ca69aa5df356d4d24
+refs/heads/master: 45c6ceb547ad2d98215351974a4686bf8cb13e14
diff --git a/trunk/fs/ceph/messenger.c b/trunk/fs/ceph/messenger.c
index 509f57d9ccb3..a3a8f368845b 100644
--- a/trunk/fs/ceph/messenger.c
+++ b/trunk/fs/ceph/messenger.c
@@ -2085,15 +2085,19 @@ struct ceph_msg *ceph_msg_new(int type, int front_len,
 	kref_init(&m->kref);
 	INIT_LIST_HEAD(&m->list_head);
 
+	m->hdr.tid = 0;
 	m->hdr.type = cpu_to_le16(type);
+	m->hdr.priority = cpu_to_le16(CEPH_MSG_PRIO_DEFAULT);
+	m->hdr.version = 0;
 	m->hdr.front_len = cpu_to_le32(front_len);
 	m->hdr.middle_len = 0;
 	m->hdr.data_len = cpu_to_le32(page_len);
 	m->hdr.data_off = cpu_to_le16(page_off);
-	m->hdr.priority = cpu_to_le16(CEPH_MSG_PRIO_DEFAULT);
+	m->hdr.reserved = 0;
 	m->footer.front_crc = 0;
 	m->footer.middle_crc = 0;
 	m->footer.data_crc = 0;
+	m->footer.flags = 0;
 	m->front_max = front_len;
 	m->front_is_vmalloc = false;
 	m->more_to_follow = false;