[sheepdog] [PATCH v4 2/3] move enum cluster_join_result from sheep/cluster.h to include/internal_proto.h
Hitoshi Mitake
h.mitake at gmail.com
Mon Dec 24 08:44:27 CET 2012
From: Hitoshi Mitake <mitake.hitoshi at lab.ntt.co.jp>
enum cluster_join_result is also used by sheepkeeper. So this patch
moves it from sheep/ to include/.
Signed-off-by: Hitoshi Mitake <mitake.hitoshi at lab.ntt.co.jp>
---
include/internal_proto.h | 10 ++++++++++
sheep/cluster.h | 10 ----------
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/include/internal_proto.h b/include/internal_proto.h
index b4b74a3..dcdb229 100644
--- a/include/internal_proto.h
+++ b/include/internal_proto.h
@@ -265,4 +265,14 @@ static inline struct sd_node *str_to_node(const char *str, struct sd_node *id)
return id;
}
+enum cluster_join_result {
+ CJ_RES_SUCCESS, /* Success */
+ CJ_RES_FAIL, /* Fail to join. The joining node has an invalidepoch. */
+ CJ_RES_JOIN_LATER, /* Fail to join. The joining node should
+ * be added after the cluster start working. */
+ CJ_RES_MASTER_TRANSFER, /* Transfer mastership. The joining
+ * node has a newer epoch, so this node
+ * will leave the cluster (restart later). */
+};
+
#endif /* __INTERNAL_PROTO_H__ */
diff --git a/sheep/cluster.h b/sheep/cluster.h
index aa0ede6..659e228 100644
--- a/sheep/cluster.h
+++ b/sheep/cluster.h
@@ -26,16 +26,6 @@
/* maximum payload size sent in ->notify and ->unblock */
#define SD_MAX_EVENT_BUF_SIZE (64 * 1024)
-enum cluster_join_result {
- CJ_RES_SUCCESS, /* Success */
- CJ_RES_FAIL, /* Fail to join. The joining node has an invalidepoch. */
- CJ_RES_JOIN_LATER, /* Fail to join. The joining node should
- * be added after the cluster start working. */
- CJ_RES_MASTER_TRANSFER, /* Transfer mastership. The joining
- * node has a newer epoch, so this node
- * will leave the cluster (restart later). */
-};
-
struct cluster_driver {
const char *name;
--
1.7.5.1
More information about the sheepdog
mailing list