summaryrefslogtreecommitdiffstats
path: root/xlators/protocol/server
diff options
context:
space:
mode:
Diffstat (limited to 'xlators/protocol/server')
-rw-r--r--xlators/protocol/server/src/server-handshake.c4
-rw-r--r--xlators/protocol/server/src/server-helpers.c18
-rw-r--r--xlators/protocol/server/src/server.c3
-rw-r--r--xlators/protocol/server/src/server3_1-fops.c8
4 files changed, 17 insertions, 16 deletions
diff --git a/xlators/protocol/server/src/server-handshake.c b/xlators/protocol/server/src/server-handshake.c
index bc4d4afa2..94586d20c 100644
--- a/xlators/protocol/server/src/server-handshake.c
+++ b/xlators/protocol/server/src/server-handshake.c
@@ -614,7 +614,7 @@ server_setvolume (rpcsvc_request_t *req)
fail:
rsp.dict.dict_len = dict_serialized_length (reply);
if (rsp.dict.dict_len < 0) {
- gf_log (this->name, GF_LOG_DEBUG,
+ gf_log ("server-handshake", GF_LOG_DEBUG,
"failed to get serialized length of reply dict");
op_ret = -1;
op_errno = EINVAL;
@@ -627,7 +627,7 @@ fail:
if (rsp.dict.dict_val) {
ret = dict_serialize (reply, rsp.dict.dict_val);
if (ret < 0) {
- gf_log (this->name, GF_LOG_DEBUG,
+ gf_log ("server-handshake", GF_LOG_DEBUG,
"failed to serialize reply dict");
op_ret = -1;
op_errno = -ret;
diff --git a/xlators/protocol/server/src/server-helpers.c b/xlators/protocol/server/src/server-helpers.c
index 11c489e88..216204a8b 100644
--- a/xlators/protocol/server/src/server-helpers.c
+++ b/xlators/protocol/server/src/server-helpers.c
@@ -541,15 +541,17 @@ server_connection_destroy (xlator_t *this, server_connection_t *conn)
INIT_LIST_HEAD (&file_lockers);
INIT_LIST_HEAD (&dir_lockers);
- LOCK (&ltable->lock);
- {
- list_splice_init (&ltable->file_lockers,
- &file_lockers);
+ if (ltable) {
+ LOCK (&ltable->lock);
+ {
+ list_splice_init (&ltable->file_lockers,
+ &file_lockers);
- list_splice_init (&ltable->dir_lockers, &dir_lockers);
+ list_splice_init (&ltable->dir_lockers, &dir_lockers);
+ }
+ UNLOCK (&ltable->lock);
+ GF_FREE (ltable);
}
- UNLOCK (&ltable->lock);
- GF_FREE (ltable);
flock.l_type = F_UNLCK;
flock.l_start = 0;
@@ -1030,7 +1032,7 @@ server_print_params (char *str, int size, server_state_t *state)
"wbflags=%d,", state->wbflags);
if (state->size)
filled += snprintf (str + filled, size - filled,
- "size=%Zu,", state->size);
+ "size=%zu,", state->size);
if (state->offset)
filled += snprintf (str + filled, size - filled,
"offset=%"PRId64",", state->offset);
diff --git a/xlators/protocol/server/src/server.c b/xlators/protocol/server/src/server.c
index 104274edd..a7501babb 100644
--- a/xlators/protocol/server/src/server.c
+++ b/xlators/protocol/server/src/server.c
@@ -593,10 +593,9 @@ init (xlator_t *this)
ret = 0;
out:
- if (ret)
+ if (ret && this)
this->fini (this);
-
return ret;
}
diff --git a/xlators/protocol/server/src/server3_1-fops.c b/xlators/protocol/server/src/server3_1-fops.c
index 686c0350d..c04861ddf 100644
--- a/xlators/protocol/server/src/server3_1-fops.c
+++ b/xlators/protocol/server/src/server3_1-fops.c
@@ -4737,7 +4737,7 @@ server_lookup (rpcsvc_request_t *req)
if (buf == NULL) {
gf_log (conn->bound_xl->name, GF_LOG_ERROR,
"out of memory");
- goto err;
+ goto out;
}
ret = dict_unserialize (buf, args.dict.dict_len,
@@ -4748,7 +4748,7 @@ server_lookup (rpcsvc_request_t *req)
"unserialize req-buffer to dictionary",
frame->root->unique, state->resolve.path,
state->resolve.ino);
- goto err;
+ goto out;
}
state->dict = xattr_req;
@@ -4761,7 +4761,7 @@ server_lookup (rpcsvc_request_t *req)
resolve_and_resume (frame, server_lookup_resume);
return 0;
-err:
+out:
if (xattr_req)
dict_unref (xattr_req);
@@ -4771,7 +4771,7 @@ err:
server_lookup_cbk (frame, NULL, frame->this, -1, EINVAL, NULL, NULL,
NULL, NULL);
-
+err:
return 0;
}