From f659f67d142498b80fecb3dfce8891be51f09b4b Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@inktank.com>
Date: Mon, 9 Jul 2012 14:31:41 -0700
Subject: [PATCH] --- yaml --- r: 320307 b: refs/heads/master c:
 cd43045c2de60f40a0aea49bfb252a2eafe58f8c h: refs/heads/master i:   320305:
 0609bcba3d19eb08499f13397dbad131ed5cbc08   320303:
 2ab1d8c0451e07220eac9dba6b9161e788cd7e48 v: v3

---
 [refs]                      | 2 +-
 trunk/net/ceph/osd_client.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index b7c409a6aa7f..cdbca21979aa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d50b409fb8698571d8209e5adfe122e287e31290
+refs/heads/master: cd43045c2de60f40a0aea49bfb252a2eafe58f8c
diff --git a/trunk/net/ceph/osd_client.c b/trunk/net/ceph/osd_client.c
index 4475d17863ee..07920cac31a6 100644
--- a/trunk/net/ceph/osd_client.c
+++ b/trunk/net/ceph/osd_client.c
@@ -213,10 +213,13 @@ struct ceph_osd_request *ceph_osdc_alloc_request(struct ceph_osd_client *osdc,
 	kref_init(&req->r_kref);
 	init_completion(&req->r_completion);
 	init_completion(&req->r_safe_completion);
+	rb_init_node(&req->r_node);
 	INIT_LIST_HEAD(&req->r_unsafe_item);
 	INIT_LIST_HEAD(&req->r_linger_item);
 	INIT_LIST_HEAD(&req->r_linger_osd);
 	INIT_LIST_HEAD(&req->r_req_lru_item);
+	INIT_LIST_HEAD(&req->r_osd_item);
+
 	req->r_flags = flags;
 
 	WARN_ON((flags & (CEPH_OSD_FLAG_READ|CEPH_OSD_FLAG_WRITE)) == 0);