summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorAlex Elder <elder@inktank.com>2012-12-06 07:22:04 -0600
committerAlex Elder <elder@inktank.com>2012-12-20 10:56:21 -0600
commitf407731d12214e7686819018f3a1e9d7b6f83a02 (patch)
tree5a7379862a9925b97795ddd6aa4b4b466e07d48e /net
parent28362986f8743124b3a0fda20a8ed3e80309cce1 (diff)
downloadlinux-3.10-f407731d12214e7686819018f3a1e9d7b6f83a02.tar.gz
linux-3.10-f407731d12214e7686819018f3a1e9d7b6f83a02.tar.bz2
linux-3.10-f407731d12214e7686819018f3a1e9d7b6f83a02.zip
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>
Diffstat (limited to 'net')
-rw-r--r--net/ceph/osd_client.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c
index 32bd696b39a..a6dc6acd656 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);