diff options
| author | Krishnan Parthasarathi <kparthas@redhat.com> | 2015-05-19 15:01:08 +0530 |
|---|---|---|
| committer | Raghavendra G <rgowdapp@redhat.com> | 2015-11-02 21:53:39 -0800 |
| commit | c8f0d11918cc7d3577d624f2d757dc975c8bfad7 (patch) | |
| tree | 5b268cad21161c30cb558615dfcba9fa18d534f9 /rpc/rpc-lib/src/rpc-clnt-ping.c | |
| parent | 3d3176958b7da48dbacb1a5a0fedf26322a38297 (diff) | |
rpc: fix possible deadlock left behind in d448fd1
See http://review.gluster.org/9613 for more details.
BUG: 1233019
Change-Id: I05ac0267b8c6f4e9b354acbbdf5469835455fb10
Signed-off-by: Krishnan Parthasarathi <kparthas@redhat.com>
Reviewed-on: http://review.gluster.org/10821
Reviewed-by: Raghavendra G <rgowdapp@redhat.com>
Tested-by: Raghavendra G <rgowdapp@redhat.com>
(cherry picked from commit e902df70f8157db4db503b7ec3c2635b08b3dcb2)
Reviewed-on: http://review.gluster.org/11303
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Diffstat (limited to 'rpc/rpc-lib/src/rpc-clnt-ping.c')
| -rw-r--r-- | rpc/rpc-lib/src/rpc-clnt-ping.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/rpc/rpc-lib/src/rpc-clnt-ping.c b/rpc/rpc-lib/src/rpc-clnt-ping.c index 77f3e32001c..3f794dbdd6a 100644 --- a/rpc/rpc-lib/src/rpc-clnt-ping.c +++ b/rpc/rpc-lib/src/rpc-clnt-ping.c @@ -75,8 +75,8 @@ __rpc_clnt_rearm_ping_timer (struct rpc_clnt *rpc, gf_timer_cbk_t cbk) } /* Must be called under conn->lock */ -static int -__rpc_clnt_remove_ping_timer (struct rpc_clnt *rpc) +int +rpc_clnt_remove_ping_timer_locked (struct rpc_clnt *rpc) { rpc_clnt_connection_t *conn = &rpc->conn; gf_timer_t *timer = NULL; @@ -126,7 +126,7 @@ rpc_clnt_ping_timer_expired (void *rpc_ptr) pthread_mutex_lock (&conn->lock); { - unref = __rpc_clnt_remove_ping_timer (rpc); + unref = rpc_clnt_remove_ping_timer_locked (rpc); gettimeofday (¤t, NULL); if (((current.tv_sec - conn->last_received.tv_sec) < @@ -197,7 +197,7 @@ rpc_clnt_ping_cbk (struct rpc_req *req, struct iovec *iov, int count, pthread_mutex_lock (&conn->lock); { if (req->rpc_status == -1) { - unref = __rpc_clnt_remove_ping_timer (rpc); + unref = rpc_clnt_remove_ping_timer_locked (rpc); if (unref) { gf_log (this->name, GF_LOG_WARNING, "socket or ib related error"); @@ -212,7 +212,7 @@ rpc_clnt_ping_cbk (struct rpc_req *req, struct iovec *iov, int count, goto unlock; } - unref = __rpc_clnt_remove_ping_timer (rpc); + unref = rpc_clnt_remove_ping_timer_locked (rpc); if (__rpc_clnt_rearm_ping_timer (rpc, rpc_clnt_start_ping) == -1) { gf_log (this->name, GF_LOG_WARNING, @@ -284,7 +284,7 @@ rpc_clnt_start_ping (void *rpc_ptr) pthread_mutex_lock (&conn->lock); { - unref = __rpc_clnt_remove_ping_timer (rpc); + unref = rpc_clnt_remove_ping_timer_locked (rpc); if (conn->saved_frames) { GF_ASSERT (conn->saved_frames->count >= 0); |