summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Elder <elder@inktank.com>2012-12-17 12:23:48 -0600
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-01-17 08:51:19 -0800
commit76fb865bcfeba57652edf054fd36aeed38ba5ceb (patch)
tree8cdaf89d02edb6bdb5dcb5c4c1bf976bf3969c5e
parent281c5d9e31a2411055bc750d81dd38d11131648e (diff)
downloadlinux-3.10-76fb865bcfeba57652edf054fd36aeed38ba5ceb.tar.gz
linux-3.10-76fb865bcfeba57652edf054fd36aeed38ba5ceb.tar.bz2
linux-3.10-76fb865bcfeba57652edf054fd36aeed38ba5ceb.zip
libceph: init event->node in ceph_osdc_create_event()
The red-black node node in the ceph osd event structure is not initialized in create_osdc_create_event(). 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. Signed-off-by: Alex Elder <elder@inktank.com> Reviewed-by: Sage Weil <sage@inktank.com> (cherry picked from commit 3ee5234df68d253c415ba4f2db72ad250d9c21a9) Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-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 0b3fbdd7100..6af3d2af31c 100644
--- a/net/ceph/osd_client.c
+++ b/net/ceph/osd_client.c
@@ -1598,6 +1598,7 @@ int ceph_osdc_create_event(struct ceph_osd_client *osdc,
event->data = data;
event->osdc = osdc;
INIT_LIST_HEAD(&event->osd_node);
+ RB_CLEAR_NODE(&event->node);
kref_init(&event->kref); /* one ref for us */
kref_get(&event->kref); /* one ref for the caller */
init_completion(&event->completion);