summaryrefslogtreecommitdiffstats
path: root/xlators/protocol/server
diff options
context:
space:
mode:
authorKaleb S. KEITHLEY <kkeithle@redhat.com>2016-08-22 12:15:14 -0400
committerRaghavendra G <rgowdapp@redhat.com>2016-08-27 04:17:49 -0700
commitbe93ca2b9f3f1bb5d38b0fd306c19c4b3d0923f7 (patch)
tree6f4aeec1124a3330188503f2ec7b6c3337d8684c /xlators/protocol/server
parent3cc7f6588c281846f8c590553da03dd16f150e8a (diff)
protocol/server: fix unused variable warnings/errors
http://review.gluster.org/14085 fixes a/the "leak" - via the generated rpc/xdr headers - of pragmas that mask these warnings. However 14085 won't pass the smoke test until all the warnings are fixed. Change-Id: I5a48055c4b0a4a07dd511ad4f2e9ef823b9c60b2 BUG: 1369124 Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com> Reviewed-on: http://review.gluster.org/15255 Smoke: Gluster Build System <jenkins@build.gluster.org> NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org> CentOS-regression: Gluster Build System <jenkins@build.gluster.org> Reviewed-by: Raghavendra G <rgowdapp@redhat.com>
Diffstat (limited to 'xlators/protocol/server')
-rw-r--r--xlators/protocol/server/src/server-common.c3
-rw-r--r--xlators/protocol/server/src/server-helpers.c3
-rw-r--r--xlators/protocol/server/src/server-resolve.c5
-rw-r--r--xlators/protocol/server/src/server-rpc-fops.c19
-rw-r--r--xlators/protocol/server/src/server.c11
5 files changed, 5 insertions, 36 deletions
diff --git a/xlators/protocol/server/src/server-common.c b/xlators/protocol/server/src/server-common.c
index 9a023aaa49e..90d66dd7597 100644
--- a/xlators/protocol/server/src/server-common.c
+++ b/xlators/protocol/server/src/server-common.c
@@ -273,7 +273,6 @@ server_post_rename (call_frame_t *frame,
struct iatt *postnewparent)
{
inode_t *tmp_inode = NULL;
- inode_t *tmp_parent = NULL;
stbuf->ia_type = state->loc.inode->ia_type;
@@ -319,7 +318,6 @@ server_post_open (call_frame_t *frame, xlator_t *this,
{
server_ctx_t *serv_ctx = NULL;
uint64_t fd_no = 0;
- int ret = 0;
serv_ctx = server_ctx_get (frame->root->client, this);
if (serv_ctx == NULL) {
@@ -350,7 +348,6 @@ server_post_opendir (call_frame_t *frame, xlator_t *this,
{
server_ctx_t *serv_ctx = NULL;
uint64_t fd_no = 0;
- int ret = 0;
serv_ctx = server_ctx_get (frame->root->client, this);
if (serv_ctx == NULL) {
diff --git a/xlators/protocol/server/src/server-helpers.c b/xlators/protocol/server/src/server-helpers.c
index 474db926629..1ec6024269c 100644
--- a/xlators/protocol/server/src/server-helpers.c
+++ b/xlators/protocol/server/src/server-helpers.c
@@ -1320,8 +1320,6 @@ unserialize_req_locklist (gfs3_setactivelk_req *req,
{
struct gfs3_locklist *trav = NULL;
lock_migration_info_t *temp = NULL;
- char *buf = NULL;
- int entry_len = 0;
int ret = -1;
trav = req->request;
@@ -2267,7 +2265,6 @@ server_populate_compound_response (xlator_t *this, gfs3_compound_rsp *rsp,
compound_args_cbk_t *args_cbk, int index)
{
int op_errno = ENOMEM;
- int op_ret = -1;
default_args_cbk_t *this_args_cbk = NULL;
compound_rsp *this_rsp = NULL;
server_state_t *state = NULL;
diff --git a/xlators/protocol/server/src/server-resolve.c b/xlators/protocol/server/src/server-resolve.c
index 1ad45394dd7..d0126aa63e3 100644
--- a/xlators/protocol/server/src/server-resolve.c
+++ b/xlators/protocol/server/src/server-resolve.c
@@ -30,8 +30,6 @@ resolve_loc_touchup (call_frame_t *frame)
server_state_t *state = NULL;
server_resolve_t *resolve = NULL;
loc_t *loc = NULL;
- char *path = NULL;
- int ret = 0;
state = CALL_STATE (frame);
@@ -192,7 +190,6 @@ resolve_gfid (call_frame_t *frame)
xlator_t *this = NULL;
server_resolve_t *resolve = NULL;
loc_t *resolve_loc = NULL;
- int ret = 0;
dict_t *xdata = NULL;
state = CALL_STATE (frame);
@@ -207,7 +204,7 @@ resolve_gfid (call_frame_t *frame)
resolve_loc->inode = server_inode_new (state->itable,
resolve_loc->gfid);
- ret = loc_path (resolve_loc, NULL);
+ (void) loc_path (resolve_loc, NULL);
if (state->xdata) {
xdata = dict_copy_with_ref (state->xdata, NULL);
diff --git a/xlators/protocol/server/src/server-rpc-fops.c b/xlators/protocol/server/src/server-rpc-fops.c
index fa160a52d79..4dd7ad90e6a 100644
--- a/xlators/protocol/server/src/server-rpc-fops.c
+++ b/xlators/protocol/server/src/server-rpc-fops.c
@@ -82,8 +82,6 @@ server_lookup_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
{
rpcsvc_request_t *req = NULL;
server_state_t *state = NULL;
- inode_t *root_inode = NULL;
- inode_t *link_inode = NULL;
loc_t fresh_loc = {0,};
gfs3_lookup_rsp rsp = {0,};
@@ -647,7 +645,6 @@ server_opendir_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
int32_t op_ret, int32_t op_errno, fd_t *fd, dict_t *xdata)
{
server_state_t *state = NULL;
- server_ctx_t *serv_ctx = NULL;
rpcsvc_request_t *req = NULL;
gfs3_opendir_rsp rsp = {0,};
uint64_t fd_no = 0;
@@ -1063,7 +1060,6 @@ server_symlink_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
{
gfs3_symlink_rsp rsp = {0,};
server_state_t *state = NULL;
- inode_t *link_inode = NULL;
rpcsvc_request_t *req = NULL;
GF_PROTOCOL_DICT_SERIALIZE (this, xdata, &rsp.xdata.xdata_val,
@@ -1105,7 +1101,6 @@ server_link_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
{
gfs3_link_rsp rsp = {0,};
server_state_t *state = NULL;
- inode_t *link_inode = NULL;
rpcsvc_request_t *req = NULL;
char gfid_str[50] = {0,};
char newpar_str[50] = {0,};
@@ -1454,9 +1449,7 @@ server_open_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
int32_t op_ret, int32_t op_errno, fd_t *fd, dict_t *xdata)
{
server_state_t *state = NULL;
- server_ctx_t *serv_ctx = NULL;
rpcsvc_request_t *req = NULL;
- uint64_t fd_no = 0;
gfs3_open_rsp rsp = {0,};
GF_PROTOCOL_DICT_SERIALIZE (this, xdata, &rsp.xdata.xdata_val,
@@ -2027,7 +2020,6 @@ server_setactivelk_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
gfs3_setactivelk_rsp rsp = {0,};
server_state_t *state = NULL;
rpcsvc_request_t *req = NULL;
- int ret = 0;
state = CALL_STATE (frame);
@@ -6459,7 +6451,6 @@ server3_3_lookup (rpcsvc_request_t *req)
server_state_t *state = NULL;
gfs3_lookup_req args = {{0,},};
int ret = -1;
- int op_errno = 0;
GF_VALIDATE_OR_GOTO ("server", req, err);
@@ -6506,17 +6497,17 @@ server3_3_lookup (rpcsvc_request_t *req)
state->xdata,
args.xdata.xdata_val,
args.xdata.xdata_len, ret,
- op_errno, out);
+ ret, out);
ret = 0;
resolve_and_resume (frame, server_lookup_resume);
return ret;
out:
-
server_lookup_cbk (frame, NULL, frame->this, -1, EINVAL, NULL, NULL,
NULL, NULL);
- ret = 0;
+ ret = 0;
+
err:
return ret;
}
@@ -6581,8 +6572,7 @@ server3_3_getactivelk (rpcsvc_request_t *req)
{
server_state_t *state = NULL;
call_frame_t *frame = NULL;
- gfs3_getactivelk_req args = {{0,},};
- size_t headers_size = 0;
+ gfs3_getactivelk_req args = {{0,},};
int ret = -1;
int op_errno = 0;
@@ -6638,7 +6628,6 @@ server3_3_setactivelk (rpcsvc_request_t *req)
server_state_t *state = NULL;
call_frame_t *frame = NULL;
gfs3_setactivelk_req args = {{0,},};
- size_t headers_size = 0;
int ret = -1;
int op_errno = 0;
diff --git a/xlators/protocol/server/src/server.c b/xlators/protocol/server/src/server.c
index 269d5f3bffd..f04dd67f61d 100644
--- a/xlators/protocol/server/src/server.c
+++ b/xlators/protocol/server/src/server.c
@@ -150,7 +150,6 @@ server_submit_reply (call_frame_t *frame, rpcsvc_request_t *req, void *arg,
char new_iobref = 0;
client_t *client = NULL;
gf_boolean_t lk_heal = _gf_false;
- gf_boolean_t barriered = _gf_false;
GF_VALIDATE_OR_GOTO ("server", req, ret);
@@ -716,7 +715,6 @@ reconfigure (xlator_t *this, dict_t *options)
data_t *data;
int ret = 0;
char *statedump_path = NULL;
- xlator_t *xl = NULL;
int32_t new_nthread = 0;
conf = this->private;
@@ -1291,21 +1289,12 @@ int
notify (xlator_t *this, int32_t event, void *data, ...)
{
int ret = -1;
- int32_t val = 0;
- dict_t *dict = NULL;
- dict_t *output = NULL;
server_conf_t *conf = NULL;
- va_list ap;
GF_VALIDATE_OR_GOTO (THIS->name, this, out);
conf = this->private;
GF_VALIDATE_OR_GOTO (this->name, conf, out);
- dict = data;
- va_start (ap, data);
- output = va_arg (ap, dict_t*);
- va_end (ap);
-
switch (event) {
case GF_EVENT_UPCALL:
{