From 0f2113cb0c3f9dff028fb45a62ec2d1d82b4cb66 Mon Sep 17 00:00:00 2001 From: Kinglong Mee Date: Tue, 25 Sep 2018 03:40:44 -0400 Subject: socket: clear return value if error is going to be handled in event thread Change-Id: Ibce94f282b0aafaa1ca60ab927a469b70595e81f updates: bz#1626313 Signed-off-by: Zhang Huan --- rpc/rpc-transport/socket/src/socket.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'rpc/rpc-transport') diff --git a/rpc/rpc-transport/socket/src/socket.c b/rpc/rpc-transport/socket/src/socket.c index 46929ceee32..94b03f913ab 100644 --- a/rpc/rpc-transport/socket/src/socket.c +++ b/rpc/rpc-transport/socket/src/socket.c @@ -3508,6 +3508,7 @@ socket_connect(rpc_transport_t *this, int port) will result in EPOLLERR, so cleanup is done in socket_event_handler or socket_poller */ shutdown(priv->sock, SHUT_RDWR); + ret = 0; gf_log(this->name, GF_LOG_TRACE, "@@@ client shutdown(%d, SHUT_RDWR)", priv->sock); } @@ -3555,6 +3556,8 @@ err: GF_FREE(arg); GF_ASSERT(0); } + + ret = 0; } return ret; -- cgit