summaryrefslogtreecommitdiffstats
path: root/rpc
diff options
context:
space:
mode:
authorPrasanna Kumar Kalever <prasanna.kalever@redhat.com>2017-01-27 13:56:01 +0530
committerPrasanna Kumar Kalever <prasanna.kalever@redhat.com>2017-01-30 19:31:50 +0530
commitaa861a01de2f89aec61dddeba13b929222143a52 (patch)
tree01019844bc4fd093eacc07e720ad392e364eb8ae /rpc
parentcd0957ca623eb048ed3c77e1b37b7316c1b238f5 (diff)
gluster-block: clean block_exec procedure
This was a hack to implement list and info commands, now that both list and info reads the metadata from the volume, we don't need block_exec anymore. Signed-off-by: Prasanna Kumar Kalever <prasanna.kalever@redhat.com>
Diffstat (limited to 'rpc')
-rw-r--r--rpc/block.h6
-rw-r--r--rpc/block.x1
-rw-r--r--rpc/block_clnt.c15
-rw-r--r--rpc/block_svc.c7
4 files changed, 0 insertions, 29 deletions
diff --git a/rpc/block.h b/rpc/block.h
index 132cf63..98ec806 100644
--- a/rpc/block.h
+++ b/rpc/block.h
@@ -115,9 +115,6 @@ extern blockResponse * block_create_1_svc(blockCreate *, struct svc_req *);
#define BLOCK_DELETE 2
extern blockResponse * block_delete_1(blockDelete *, CLIENT *);
extern blockResponse * block_delete_1_svc(blockDelete *, struct svc_req *);
-#define BLOCK_EXEC 3
-extern blockResponse * block_exec_1(char **, CLIENT *);
-extern blockResponse * block_exec_1_svc(char **, struct svc_req *);
extern int gluster_block_1_freeresult (SVCXPRT *, xdrproc_t, caddr_t);
#else /* K&R C */
@@ -127,9 +124,6 @@ extern blockResponse * block_create_1_svc();
#define BLOCK_DELETE 2
extern blockResponse * block_delete_1();
extern blockResponse * block_delete_1_svc();
-#define BLOCK_EXEC 3
-extern blockResponse * block_exec_1();
-extern blockResponse * block_exec_1_svc();
extern int gluster_block_1_freeresult ();
#endif /* K&R C */
diff --git a/rpc/block.x b/rpc/block.x
index e5c1984..21c30aa 100644
--- a/rpc/block.x
+++ b/rpc/block.x
@@ -57,6 +57,5 @@ program GLUSTER_BLOCK {
version GLUSTER_BLOCK_VERS {
blockResponse BLOCK_CREATE(blockCreate) = 1;
blockResponse BLOCK_DELETE(blockDelete) = 2;
- blockResponse BLOCK_EXEC(string) = 3;
} = 1;
} = 21215311; /* B2 L12 O15 C3 K11 */
diff --git a/rpc/block_clnt.c b/rpc/block_clnt.c
index 2e96709..4c10231 100644
--- a/rpc/block_clnt.c
+++ b/rpc/block_clnt.c
@@ -98,18 +98,3 @@ block_delete_1(blockDelete *argp, CLIENT *clnt)
}
return (&clnt_res);
}
-
-blockResponse *
-block_exec_1(char **argp, CLIENT *clnt)
-{
- static blockResponse clnt_res;
-
- memset((char *)&clnt_res, 0, sizeof(clnt_res));
- if (clnt_call (clnt, BLOCK_EXEC,
- (xdrproc_t) xdr_wrapstring, (caddr_t) argp,
- (xdrproc_t) xdr_blockResponse, (caddr_t) &clnt_res,
- TIMEOUT) != RPC_SUCCESS) {
- return (NULL);
- }
- return (&clnt_res);
-}
diff --git a/rpc/block_svc.c b/rpc/block_svc.c
index 345581f..1a908ea 100644
--- a/rpc/block_svc.c
+++ b/rpc/block_svc.c
@@ -91,7 +91,6 @@ gluster_block_1(struct svc_req *rqstp, register SVCXPRT *transp)
union {
blockCreate block_create_1_arg;
blockDelete block_delete_1_arg;
- char *block_exec_1_arg;
} argument;
char *result;
xdrproc_t _xdr_argument, _xdr_result;
@@ -114,12 +113,6 @@ gluster_block_1(struct svc_req *rqstp, register SVCXPRT *transp)
local = (char *(*)(char *, struct svc_req *)) block_delete_1_svc;
break;
- case BLOCK_EXEC:
- _xdr_argument = (xdrproc_t) xdr_wrapstring;
- _xdr_result = (xdrproc_t) xdr_blockResponse;
- local = (char *(*)(char *, struct svc_req *)) block_exec_1_svc;
- break;
-
default:
svcerr_noproc (transp);
return;