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

Hitoshi Mitake mitake.hitoshi at gmail.com
Thu Feb 6 06:21:49 CET 2014


At Tue,  4 Feb 2014 22:19:58 +0900,
Ryusuke Konishi wrote:
> 
> 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(-)

Sorry for breaking build, I'd like to use this patch.

Applied to stable-0.7, thanks.
Hitoshi

> 
> 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
> 
> -- 
> sheepdog mailing list
> sheepdog at lists.wpkg.org
> http://lists.wpkg.org/mailman/listinfo/sheepdog



More information about the sheepdog mailing list