diff options
-rw-r--r-- | xlators/protocol/server/src/server-handshake.c | 4 | ||||
-rw-r--r-- | xlators/protocol/server/src/server.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/xlators/protocol/server/src/server-handshake.c b/xlators/protocol/server/src/server-handshake.c index 920a73ffc..f9d79721e 100644 --- a/xlators/protocol/server/src/server-handshake.c +++ b/xlators/protocol/server/src/server-handshake.c @@ -567,7 +567,7 @@ server_setvolume (rpcsvc_request_t *req) gf_log (this->name, GF_LOG_INFO, "accepted client from %s (version: %s)", - (peerinfo) ? peerinfo->identifier : "<>", + conn->id, (clnt_version) ? clnt_version : "old"); op_ret = 0; conn->bound_xl = xl; @@ -578,7 +578,7 @@ server_setvolume (rpcsvc_request_t *req) } else { gf_log (this->name, GF_LOG_ERROR, "Cannot authenticate client from %s %s", - (peerinfo) ? peerinfo->identifier : "<>", + conn->id, (clnt_version) ? clnt_version : "old"); op_ret = -1; diff --git a/xlators/protocol/server/src/server.c b/xlators/protocol/server/src/server.c index c54c34091..aa21df5e6 100644 --- a/xlators/protocol/server/src/server.c +++ b/xlators/protocol/server/src/server.c @@ -673,7 +673,7 @@ server_rpc_notify (rpcsvc_t *rpc, void *xl, rpcsvc_event_t event, */ pthread_mutex_lock (&conf->mutex); { - list_del (&xprt->list); + list_del_init (&xprt->list); } pthread_mutex_unlock (&conf->mutex); |