summaryrefslogtreecommitdiffstats
path: root/libglusterfs/src/timer.c
diff options
context:
space:
mode:
authorN Balachandran <nbalacha@redhat.com>2015-10-20 22:23:17 +0530
committerDan Lambright <dlambrig@redhat.com>2015-10-21 19:47:39 -0700
commit594a03b030577bf0ed6960199e920cc5fa7e7afc (patch)
tree2c99babdb9efe4604b6deed5f4ff7fd05220b3cf /libglusterfs/src/timer.c
parent36974c36fa4231df3f0e9428a9da6d1aa33348ab (diff)
tests/tier: Move common functions to tier.rc
Move common functions in tier .t files to tier.rc Change-Id: Ibc312d987be9d93e7cc7fc47d0bf598bb1c944c2 BUG: 1272319 Signed-off-by: N Balachandran <nbalacha@redhat.com> Reviewed-on: http://review.gluster.org/12404 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Dan Lambright <dlambrig@redhat.com> Tested-by: Dan Lambright <dlambrig@redhat.com>
Diffstat (limited to 'libglusterfs/src/timer.c')
0 files changed, 0 insertions, 0 deletions
'add' style='width: 40.0%;'/>
1 files changed, 2 insertions, 3 deletions
diff --git a/xlators/protocol/server/src/server.c b/xlators/protocol/server/src/server.c
index 5271d157ba6..a7fe3b2eedf 100644
--- a/xlators/protocol/server/src/server.c
+++ b/xlators/protocol/server/src/server.c
@@ -77,7 +77,7 @@ grace_time_handler (void *data)
*/
gf_client_put (client, &detached);
- if (detached) /* reconnection did not happen :-( */
+ if (client && detached) /* reconnection did not happen :-( */
server_connection_cleanup (this, client,
INTERNAL_LOCKS | POSIX_LOCKS);
gf_client_unref (client);
@@ -547,7 +547,7 @@ server_rpc_notify (rpcsvc_t *rpc, void *xl, rpcsvc_event_t event,
if (!conf->lk_heal) {
gf_client_ref (client);
gf_client_put (client, &detached);
- if (detached) {
+ if (client && detached) {
server_connection_cleanup (this, client,
INTERNAL_LOCKS | POSIX_LOCKS);
@@ -833,7 +833,6 @@ reconfigure (xlator_t *this, dict_t *options)
gf_msg (this->name, GF_LOG_ERROR, 0,
PS_MSG_STATEDUMP_PATH_ERROR,
"Error while reconfiguring statedump path");
- ret = -1;
goto do_auth;
}
gf_path_strip_trailing_slashes (statedump_path);