[Sheepdog] [PATCH] collie: remove unused operation SD_OP_SYNC_OBJ

MORITA Kazutaka morita.kazutaka at lab.ntt.co.jp
Mon May 10 12:48:38 CEST 2010


Signed-off-by: MORITA Kazutaka <morita.kazutaka at lab.ntt.co.jp>
---
 collie/collie_priv.h |    1 -
 collie/net.c         |    2 --
 collie/store.c       |   10 ----------
 3 files changed, 0 insertions(+), 13 deletions(-)

diff --git a/collie/collie_priv.h b/collie/collie_priv.h
index 43cde33..4c5ae9e 100644
--- a/collie/collie_priv.h
+++ b/collie/collie_priv.h
@@ -24,7 +24,6 @@
 #define SD_MAX_REDUNDANCY 8
 
 #define SD_OP_REMOVE_OBJ     0x91
-#define SD_OP_SYNC_OBJ       0x92
 
 #define SD_OP_GET_OBJ_LIST   0xA1
 
diff --git a/collie/net.c b/collie/net.c
index 5ee0107..137454d 100644
--- a/collie/net.c
+++ b/collie/net.c
@@ -25,7 +25,6 @@ int is_io_request(unsigned op)
 	case SD_OP_REMOVE_OBJ:
 	case SD_OP_READ_OBJ:
 	case SD_OP_WRITE_OBJ:
-	case SD_OP_SYNC_OBJ:
 		ret = 1;
 		break;
 	default:
@@ -185,7 +184,6 @@ static void queue_request(struct request *req)
 	case SD_OP_REMOVE_OBJ:
 	case SD_OP_READ_OBJ:
 	case SD_OP_WRITE_OBJ:
-	case SD_OP_SYNC_OBJ:
 	case SD_OP_STAT_SHEEP:
 	case SD_OP_GET_OBJ_LIST:
 		req->work.fn = store_queue_request;
diff --git a/collie/store.c b/collie/store.c
index 7a83ee9..eed69e8 100644
--- a/collie/store.c
+++ b/collie/store.c
@@ -607,7 +607,6 @@ static int store_queue_request_local(struct request *req, char *buf, uint32_t ep
 	case SD_OP_CREATE_AND_WRITE_OBJ:
 	case SD_OP_WRITE_OBJ:
 	case SD_OP_READ_OBJ:
-	case SD_OP_SYNC_OBJ:
 		if (opcode == SD_OP_CREATE_AND_WRITE_OBJ)
 			fd = ob_open(epoch, oid, O_CREAT, &ret);
 		else
@@ -746,15 +745,6 @@ static int store_queue_request_local(struct request *req, char *buf, uint32_t ep
 
 		ret = SD_RES_SUCCESS;
 		break;
-	case SD_OP_SYNC_OBJ:
-		ret = fsync(fd);
-		if (ret) {
-			if (errno == EIO)
-				ret = SD_RES_EIO;
-			else
-				ret = SD_RES_UNKNOWN;
-		}
-		break;
 	}
 out:
 	if (fd != -1)
-- 
1.5.6.5




More information about the sheepdog mailing list