From 9cfaef0960d206a554035000141935cc0fcf39e5 Mon Sep 17 00:00:00 2001 From: Yaniv Kaul Date: Wed, 11 Sep 2019 17:53:39 +0300 Subject: client xlator: misc. cleanups - remove dead code - move functions to be static - move some code that only needs to be executed under if branch - remove some dead assignments and redundant checks. No functional change, I hope. Change-Id: I93d952408197ecd2fa91c3f812a73c54242342fa updates: bz#1193929 Signed-off-by: Yaniv Kaul --- xlators/protocol/client/src/client-callback.c | 34 ++++++++++----------------- 1 file changed, 12 insertions(+), 22 deletions(-) (limited to 'xlators/protocol/client/src/client-callback.c') diff --git a/xlators/protocol/client/src/client-callback.c b/xlators/protocol/client/src/client-callback.c index c401c4fd791..36b69d2f51a 100644 --- a/xlators/protocol/client/src/client-callback.c +++ b/xlators/protocol/client/src/client-callback.c @@ -13,7 +13,7 @@ #include #include "client-messages.h" -int +static int client_cbk_null(struct rpc_clnt *rpc, void *mydata, void *data) { gf_msg(THIS->name, GF_LOG_WARNING, 0, PC_MSG_FUNCTION_CALL_ERROR, @@ -21,7 +21,7 @@ client_cbk_null(struct rpc_clnt *rpc, void *mydata, void *data) return 0; } -int +static int client_cbk_fetchspec(struct rpc_clnt *rpc, void *mydata, void *data) { gf_msg(THIS->name, GF_LOG_WARNING, 0, PC_MSG_FUNCTION_CALL_ERROR, @@ -29,7 +29,7 @@ client_cbk_fetchspec(struct rpc_clnt *rpc, void *mydata, void *data) return 0; } -int +static int client_cbk_ino_flush(struct rpc_clnt *rpc, void *mydata, void *data) { gf_msg(THIS->name, GF_LOG_WARNING, 0, PC_MSG_FUNCTION_CALL_ERROR, @@ -37,7 +37,7 @@ client_cbk_ino_flush(struct rpc_clnt *rpc, void *mydata, void *data) return 0; } -int +static int client_cbk_recall_lease(struct rpc_clnt *rpc, void *mydata, void *data) { int ret = -1; @@ -54,8 +54,6 @@ client_cbk_recall_lease(struct rpc_clnt *rpc, void *mydata, void *data) }, }; - GF_VALIDATE_OR_GOTO("client-callback", rpc, out); - GF_VALIDATE_OR_GOTO("client-callback", mydata, out); GF_VALIDATE_OR_GOTO("client-callback", data, out); iov = (struct iovec *)data; @@ -90,7 +88,7 @@ out: return ret; } -int +static int client_cbk_cache_invalidation(struct rpc_clnt *rpc, void *mydata, void *data) { int ret = -1; @@ -107,7 +105,7 @@ client_cbk_cache_invalidation(struct rpc_clnt *rpc, void *mydata, void *data) gf_msg_trace(THIS->name, 0, "Upcall callback is called"); - if (!rpc || !mydata || !data) + if (!data) goto out; iov = (struct iovec *)data; @@ -145,15 +143,13 @@ out: return 0; } -int +static int client_cbk_child_up(struct rpc_clnt *rpc, void *mydata, void *data) { clnt_conf_t *conf = NULL; - xlator_t *this = NULL; + xlator_t *this = THIS; - this = THIS; GF_VALIDATE_OR_GOTO("client", this, out); - GF_VALIDATE_OR_GOTO(this->name, rpc, out); conf = this->private; GF_VALIDATE_OR_GOTO(this->name, conf, out); @@ -165,15 +161,13 @@ out: return 0; } -int +static int client_cbk_child_down(struct rpc_clnt *rpc, void *mydata, void *data) { clnt_conf_t *conf = NULL; - xlator_t *this = NULL; + xlator_t *this = THIS; - this = THIS; GF_VALIDATE_OR_GOTO("client", this, out); - GF_VALIDATE_OR_GOTO(this->name, rpc, out); conf = this->private; GF_VALIDATE_OR_GOTO(this->name, conf, out); @@ -185,7 +179,7 @@ out: return 0; } -int +static int client_cbk_inodelk_contention(struct rpc_clnt *rpc, void *mydata, void *data) { int ret = -1; @@ -204,8 +198,6 @@ client_cbk_inodelk_contention(struct rpc_clnt *rpc, void *mydata, void *data) }, }; - GF_VALIDATE_OR_GOTO("client-callback", rpc, out); - GF_VALIDATE_OR_GOTO("client-callback", mydata, out); GF_VALIDATE_OR_GOTO("client-callback", data, out); iov = (struct iovec *)data; @@ -240,7 +232,7 @@ out: return ret; } -int +static int client_cbk_entrylk_contention(struct rpc_clnt *rpc, void *mydata, void *data) { int ret = -1; @@ -257,8 +249,6 @@ client_cbk_entrylk_contention(struct rpc_clnt *rpc, void *mydata, void *data) }, }; - GF_VALIDATE_OR_GOTO("client-callback", rpc, out); - GF_VALIDATE_OR_GOTO("client-callback", mydata, out); GF_VALIDATE_OR_GOTO("client-callback", data, out); iov = (struct iovec *)data; -- cgit