Commit a978fa20 authored Dec 17, 2012 by Alex Elder

libceph: don't use rb_init_node() in ceph_osdc_alloc_request()



The red-black node in the ceph osd request structure is initialized
in ceph_osdc_alloc_request() using rbd_init_node().  We do need to
initialize this, because in __unregister_request() we call
RB_EMPTY_NODE(), which expects the node it's checking to have
been initialized.  But rb_init_node() is apparently overkill, and
may in fact be on its way out.  So use RB_CLEAR_NODE() instead.

For a little more background, see this commit:
    4c199a93 rbtree: empty nodes have no color"

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

parent 3ee5234d

net/ceph/osd_client.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -221,7 +221,7 @@ 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);
		RB_CLEAR_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);

Admin message