From: Stephen Rothwell Date: Tue, 14 Aug 2012 03:22:39 +0000 (+1000) Subject: rbtree-empty-nodes-have-no-color-fix X-Git-Tag: next-20120820~1^2~21 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=aaacb2c4d7a40cca7c77bba62d977d50dfa29992;p=karo-tx-linux.git rbtree-empty-nodes-have-no-color-fix After merging the akpm tree, today's linux-next build (x86_64 allmodconfig) failed like this: net/ceph/osd_client.c: In function 'ceph_osdc_alloc_request': net/ceph/osd_client.c:216:2: error: implicit declaration of function 'rb_in= it_node' [-Werror=3Dimplicit-function-declaration] Caused by commit 753b960e52b7 ("rbtree: empty nodes have no color") from the akpm tree interacting with commit cd43045c2de6 ("libceph: initialize rb, list nodes in ceph_osd_request") from the ceph tree. Signed-off-by: Stephen Rothwell Cc: Sage Weil Reviewed-by: Michel Lespinasse Signed-off-by: Andrew Morton --- diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c index 42119c05e82c..7a392b928795 100644 --- a/net/ceph/osd_client.c +++ b/net/ceph/osd_client.c @@ -213,7 +213,6 @@ 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);