Hi Andrew,
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_init_node' [-Werror=implicit-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.
I added the following merge fix patch for today:
From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Tue, 31 Jul 2012 14:37:35 +1000
Subject: [PATCH] libceph: remove rb_node initialisation
Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
net/ceph/osd_client.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c
index ad427e6..06fb7a9 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);
--
1.7.10.280.gaa39
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
Attachment:
pgpzxujb3jY9d.pgp
Description: PGP signature
