diff options
Diffstat (limited to 'ctdb/server')
-rw-r--r-- | ctdb/server/ctdb_call.c | 4 | ||||
-rw-r--r-- | ctdb/server/ctdb_daemon.c | 2 | ||||
-rw-r--r-- | ctdb/server/ctdb_lock.c | 8 | ||||
-rw-r--r-- | ctdb/server/ctdb_logging.c | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/ctdb/server/ctdb_call.c b/ctdb/server/ctdb_call.c index db9fb6aefc5..453b4561d54 100644 --- a/ctdb/server/ctdb_call.c +++ b/ctdb/server/ctdb_call.c @@ -565,7 +565,7 @@ static int dmaster_defer_add(struct ctdb_db_context *ctdb_db, call->ctdb = ctdb_db->ctdb; call->hdr = talloc_steal(call, hdr); - DLIST_ADD_END(ddq->deferred_calls, call, NULL); + DLIST_ADD_END(ddq->deferred_calls, call); return 0; } @@ -1911,7 +1911,7 @@ child_finished: set_close_on_exec(rc->fd[0]); /* This is an active revokechild child process */ - DLIST_ADD_END(ctdb_db->revokechild_active, rc, NULL); + DLIST_ADD_END(ctdb_db->revokechild_active, rc); rc->fde = tevent_add_fd(ctdb->ev, rc, rc->fd[0], TEVENT_FD_READ, revokechild_handler, (void *)rc); diff --git a/ctdb/server/ctdb_daemon.c b/ctdb/server/ctdb_daemon.c index 36dcfad8590..9a3369166db 100644 --- a/ctdb/server/ctdb_daemon.c +++ b/ctdb/server/ctdb_daemon.c @@ -590,7 +590,7 @@ static int requeue_duplicate_fetch(struct ctdb_db_context *ctdb_db, struct ctdb_ dfc->w->ctdb = ctdb_db->ctdb; dfc->w->client_id = client->client_id; - DLIST_ADD_END(dfq->deferred_calls, dfc, NULL); + DLIST_ADD_END(dfq->deferred_calls, dfc); return 0; } diff --git a/ctdb/server/ctdb_lock.c b/ctdb/server/ctdb_lock.c index 78ba35c78a6..7962e94801f 100644 --- a/ctdb/server/ctdb_lock.c +++ b/ctdb/server/ctdb_lock.c @@ -902,10 +902,10 @@ static void ctdb_lock_schedule(struct ctdb_context *ctdb) /* Move the context from pending to current */ if (lock_ctx->type == LOCK_RECORD) { DLIST_REMOVE(lock_ctx->ctdb_db->lock_pending, lock_ctx); - DLIST_ADD_END(lock_ctx->ctdb_db->lock_current, lock_ctx, NULL); + DLIST_ADD_END(lock_ctx->ctdb_db->lock_current, lock_ctx); } else { DLIST_REMOVE(ctdb->lock_pending, lock_ctx); - DLIST_ADD_END(ctdb->lock_current, lock_ctx, NULL); + DLIST_ADD_END(ctdb->lock_current, lock_ctx); } CTDB_DECREMENT_STAT(lock_ctx->ctdb, locks.num_pending); CTDB_INCREMENT_STAT(lock_ctx->ctdb, locks.num_current); @@ -975,9 +975,9 @@ static struct lock_request *ctdb_lock_internal(TALLOC_CTX *mem_ctx, * immediately, so keep them at the head of the pending queue. */ if (lock_ctx->type == LOCK_RECORD) { - DLIST_ADD_END(ctdb_db->lock_pending, lock_ctx, NULL); + DLIST_ADD_END(ctdb_db->lock_pending, lock_ctx); } else { - DLIST_ADD_END(ctdb->lock_pending, lock_ctx, NULL); + DLIST_ADD_END(ctdb->lock_pending, lock_ctx); } CTDB_INCREMENT_STAT(ctdb, locks.num_pending); if (ctdb_db) { diff --git a/ctdb/server/ctdb_logging.c b/ctdb/server/ctdb_logging.c index 29b1982e28a..1819ab7d98c 100644 --- a/ctdb/server/ctdb_logging.c +++ b/ctdb/server/ctdb_logging.c @@ -71,7 +71,7 @@ void ctdb_log_register_backend(const char *prefix, ctdb_log_setup_fn_t setup) b->prefix = prefix; b->setup = setup; - DLIST_ADD_END(log_state->backends, b, NULL); + DLIST_ADD_END(log_state->backends, b); } |