From: Alex Elder <elder@inktank.com>
Date: Thu, 6 Dec 2012 13:22:04 +0000 (-0600)
Subject: libceph: init osd->o_node in create_osd()
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=f407731d12214e7686819018f3a1e9d7b6f83a02;p=deliverable%2Flinux.git

libceph: init osd->o_node in create_osd()

The red-black node node in the ceph osd structure is not initialized
in create_osd().  Because this node can be the subject of a
RB_EMPTY_NODE() call later on, we should ensure the node is
initialized properly for that.  Add a call to RB_CLEAR_NODE()
initialize it.

Signed-off-by: Alex Elder <elder@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
---

diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c
index 32bd696b39a8..a6dc6acd6566 100644
--- a/net/ceph/osd_client.c
+++ b/net/ceph/osd_client.c
@@ -642,6 +642,7 @@ static struct ceph_osd *create_osd(struct ceph_osd_client *osdc, int onum)
 	atomic_set(&osd->o_ref, 1);
 	osd->o_osdc = osdc;
 	osd->o_osd = onum;
+	RB_CLEAR_NODE(&osd->o_node);
 	INIT_LIST_HEAD(&osd->o_requests);
 	INIT_LIST_HEAD(&osd->o_linger_requests);
 	INIT_LIST_HEAD(&osd->o_osd_lru);