summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--libglusterfs/src/timer.c18
1 files changed, 3 insertions, 15 deletions
diff --git a/libglusterfs/src/timer.c b/libglusterfs/src/timer.c
index 3d69a9f7160..34dfd353bc8 100644
--- a/libglusterfs/src/timer.c
+++ b/libglusterfs/src/timer.c
@@ -30,10 +30,11 @@ gf_timer_call_after (glusterfs_ctx_t *ctx,
gf_timer_t *trav = NULL;
uint64_t at = 0;
- if (ctx == NULL)
+ if ((ctx == NULL) || (ctx->cleanup_started))
{
gf_msg_callingfn ("timer", GF_LOG_ERROR, EINVAL,
- LG_MSG_INVALID_ARG, "invalid argument");
+ LG_MSG_INVALID_ARG, "Either ctx is NULL or"
+ " ctx cleanup started");
return NULL;
}
@@ -186,19 +187,6 @@ gf_timer_registry_init (glusterfs_ctx_t *ctx)
{
gf_timer_registry_t *reg = NULL;
- if (ctx == NULL) {
- gf_msg_callingfn ("timer", GF_LOG_ERROR, EINVAL,
- LG_MSG_INVALID_ARG, "invalid argument");
- return NULL;
- }
-
- if (ctx->cleanup_started) {
- gf_msg_callingfn ("timer", GF_LOG_INFO, 0,
- LG_MSG_CTX_CLEANUP_STARTED,
- "ctx cleanup started");
- return NULL;
- }
-
LOCK (&ctx->lock);
{
reg = ctx->timer;