[sheepdog] [PATCH] sheep: move internal res code to internal_proto.h

Liu Yuan namei.unix at gmail.com
Thu Mar 5 10:58:58 CET 2015


From: Liu Yuan <liuyuan at cmss.chinamobile.com>

Signed-off-by: Liu Yuan <liuyuan at cmss.chinamobile.com>
---
 include/internal_proto.h | 8 ++++++++
 include/sheepdog_proto.h | 5 -----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/include/internal_proto.h b/include/internal_proto.h
index e4de527..defbe6d 100644
--- a/include/internal_proto.h
+++ b/include/internal_proto.h
@@ -144,6 +144,14 @@
 #define SD_RES_CLUSTER_ERROR    0x91 /* Cluster driver error */
 #define SD_RES_VDI_NOT_EMPTY    0x92 /* VDI is not empty */
 #define SD_RES_NOT_FOUND	0x93 /* Cannot found target */
+#define SD_RES_INCOMPLETE    0x94 /* Object (in kv) is incomplete uploading */
+/* sheep is collecting cluster wide status, not ready for operation */
+#define SD_RES_COLLECTING_CINFO 0x95
+/* inode object in client is invalidated, refreshing is required */
+#define SD_RES_INODE_INVALIDATED 0x96
+#define SD_RES_GATEWAY_MODE  0x97 /* Target node is gateway mode */
+#define SD_RES_INVALID_VNODES_STRATEGY 0x98 /* Invalid vnodes strategy */
+
 
 #define SD_CLUSTER_FLAG_STRICT		0x0001 /* Strict mode for write */
 #define SD_CLUSTER_FLAG_DISKMODE	0x0002 /* Disk mode for cluster */
diff --git a/include/sheepdog_proto.h b/include/sheepdog_proto.h
index 0599ece..f1cdcfd 100644
--- a/include/sheepdog_proto.h
+++ b/include/sheepdog_proto.h
@@ -84,11 +84,6 @@
 #define SD_RES_JOIN_FAILED   0x18 /* Target node had failed to join sheepdog */
 #define SD_RES_HALT          0x19 /* Sheepdog is stopped doing IO */
 #define SD_RES_READONLY      0x1A /* Object is read-only */
-#define SD_RES_INCOMPLETE    0x1B /* Object (in kv) is incomplete uploading */
-#define SD_RES_COLLECTING_CINFO 0x1C /* sheep is collecting cluster wide status, not ready for operation */
-#define SD_RES_INODE_INVALIDATED 0x1D /* inode object in client is invalidated, refreshing is required */
-#define SD_RES_GATEWAY_MODE  0x1E /* Target node is gateway mode */
-#define SD_RES_INVALID_VNODES_STRATEGY 0x1F /* Invalid vnodes strategy */
 
 /* errors above 0x80 are sheepdog-internal */
 
-- 
1.9.1




More information about the sheepdog mailing list