[sheepdog] [PATCH stable-0.7] zookeeper: fix build failure in sheep/cluster/zookeeper.c

Ryusuke Konishi konishi.ryusuke at lab.ntt.co.jp
Tue Feb 4 14:19:58 CET 2014


The commit 8b4a72f310f0e8a14d99187fc97066e1017759b3 "lib: rename
wrappers of pthread_rwlock" mistakenly inserted rb_destroy() in
zk_tree_destroy() function and broke build of zookeeper.

This fixes the issue.

Signed-off-by: Ryusuke Konishi <konishi.ryusuke at lab.ntt.co.jp>
Cc: Hitoshi Mitake <mitake.hitoshi at lab.ntt.co.jp>
---
 sheep/cluster/zookeeper.c |    1 -
 1 file changed, 1 deletion(-)

diff --git a/sheep/cluster/zookeeper.c b/sheep/cluster/zookeeper.c
index 28b936c..1c7b493 100644
--- a/sheep/cluster/zookeeper.c
+++ b/sheep/cluster/zookeeper.c
@@ -477,7 +477,6 @@ static inline void zk_tree_destroy(void)
 		if (zk)
 			zk_tree_del_nolock(zk);
 	}
-	rb_destroy(&zk_node_root, struct zk_node, rb);
 	sd_rw_unlock(&zk_tree_lock);
 }
 
-- 
1.7.9.3




More information about the sheepdog mailing list