[sheepdog] [PATCH v2 1/3] Add block_size_shift member to sheepdog internal data.

Teruaki Ishizaki ishizaki.teruaki at lab.ntt.co.jp
Fri Dec 12 13:48:30 CET 2014


This patch adds a information of block_size_shift
to sheepdog request, response, state.

Signed-off-by: Teruaki Ishizaki <ishizaki.teruaki at lab.ntt.co.jp>
---
 include/internal_proto.h |    5 ++++-
 include/sheepdog_proto.h |    8 ++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/include/internal_proto.h b/include/internal_proto.h
index 74b50e1..3f5d77f 100644
--- a/include/internal_proto.h
+++ b/include/internal_proto.h
@@ -212,7 +212,8 @@ struct cluster_info {
 	uint8_t nr_copies;
 	uint8_t copy_policy;
 	enum sd_status status : 8;
-	uint32_t __pad;
+	uint8_t block_size_shift;
+	uint8_t __pad[3];
 	uint8_t store[STORE_LEN];
 
 	/* Node list at cluster_info->epoch */
@@ -356,6 +357,8 @@ struct vdi_state {
 	uint8_t snapshot;
 	uint8_t deleted;
 	uint8_t copy_policy;
+	uint8_t block_size_shift;
+	uint8_t __pad[3];
 
 	uint32_t lock_state;
 
diff --git a/include/sheepdog_proto.h b/include/sheepdog_proto.h
index c25e9f1..82fa167 100644
--- a/include/sheepdog_proto.h
+++ b/include/sheepdog_proto.h
@@ -159,7 +159,7 @@ struct sd_req {
 			uint8_t		copies;
 			uint8_t		copy_policy;
 			uint8_t		store_policy;
-			uint8_t		reserved;
+			uint8_t		block_size_shift;
 			uint32_t	snapid;
 			uint32_t        type;
 		} vdi;
@@ -173,6 +173,8 @@ struct sd_req {
 			uint16_t	flags;
 			uint32_t	tag;
 			uint32_t	nodes_nr;
+			uint8_t		block_size_shift;
+			uint8_t		reserved[3];
 		} cluster;
 		struct {
 			uint32_t	old_vid;
@@ -181,6 +183,7 @@ struct sd_req {
 			uint8_t		set_bitmap; /* 0 means false */
 						    /* others mean true */
 			uint8_t		copy_policy;
+			uint8_t		block_size_shift;
 		} vdi_state;
 		struct {
 			uint64_t	oid;
@@ -228,7 +231,8 @@ struct sd_rsp {
 			uint32_t	vdi_id;
 			uint32_t	attr_id;
 			uint8_t		copies;
-			uint8_t		reserved[3];
+			uint8_t		block_size_shift;
+			uint8_t		reserved[2];
 		} vdi;
 
 		/* sheepdog-internal */
-- 
1.7.1




More information about the sheepdog mailing list