[Sheepdog] [PATCH 2/3] remove unused request header fields

MORITA Kazutaka morita.kazutaka at lab.ntt.co.jp
Mon May 10 00:41:02 CEST 2010


Signed-off-by: MORITA Kazutaka <morita.kazutaka at lab.ntt.co.jp>
---
 include/sheepdog_proto.h |    6 ++----
 shepherd/shepherd.c      |    4 ++--
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/include/sheepdog_proto.h b/include/sheepdog_proto.h
index dc9152a..5b77544 100644
--- a/include/sheepdog_proto.h
+++ b/include/sheepdog_proto.h
@@ -116,9 +116,8 @@ struct sd_obj_rsp {
 	uint32_t        id;
 	uint32_t        data_length;
 	uint32_t        result;
-	uint32_t        obj_ver;
 	uint32_t        copies;
-	uint32_t        pad[5];
+	uint32_t        pad[6];
 };
 
 struct sd_vdi_req {
@@ -145,8 +144,7 @@ struct sd_vdi_rsp {
 	uint32_t        result;
 	uint32_t        rsvd;
 	uint32_t        vdi_id;
-	uint32_t	vdi_epoch;
-	uint32_t        pad[4];
+	uint32_t        pad[5];
 };
 
 struct sheepdog_inode {
diff --git a/shepherd/shepherd.c b/shepherd/shepherd.c
index db11fca..cb5d5e3 100644
--- a/shepherd/shepherd.c
+++ b/shepherd/shepherd.c
@@ -467,8 +467,8 @@ static void do_print_obj(char *sheep, uint64_t oid, struct sd_obj_rsp *rsp,
 {
 	switch (rsp->result) {
 	case SD_RES_SUCCESS:
-		printf("%s: has the version %u (should be %d copies)\n",
-		       sheep, rsp->obj_ver, rsp->copies);
+		printf("%s: has the object (should be %d copies)\n",
+		       sheep, rsp->copies);
 		break;
 	case SD_RES_NO_OBJ:
 		printf("%s: doesn't have\n", sheep);
-- 
1.5.6.5




More information about the sheepdog mailing list