From c6b95c3672505924e9d5754457d6125f44406f4c Mon Sep 17 00:00:00 2001 From: Swen Schillig Date: Mon, 12 Mar 2018 11:00:55 +0100 Subject: [PATCH] ctdb: remove queue destructor as it isn't needed anymore After commit e097b7f8ff1a9992de1d11474dac4969e30cd679 Author: David Disseldorp Date: Sun Jul 31 03:14:54 2011 +0200 io: Make queue_io_read() safe for reentry the destructor has no purpose anymore, therfore, remove it. Signed-off-by: Swen Schillig Reviewed-by: Martin Schwenke Reviewed-by: David Disseldorp Autobuild-User(master): Martin Schwenke Autobuild-Date(master): Mon Aug 6 11:37:32 CEST 2018 on sn-devel-144 --- ctdb/common/ctdb_io.c | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/ctdb/common/ctdb_io.c b/ctdb/common/ctdb_io.c index c6941241883..da444aca2b6 100644 --- a/ctdb/common/ctdb_io.c +++ b/ctdb/common/ctdb_io.c @@ -65,7 +65,6 @@ struct ctdb_queue { size_t alignment; void *private_data; ctdb_queue_cb_fn_t callback; - bool *destroyed; const char *name; uint32_t buffer_size; }; @@ -411,17 +410,6 @@ int ctdb_queue_set_fd(struct ctdb_queue *queue, int fd) return 0; } -/* If someone sets up this pointer, they want to know if the queue is freed */ -static int queue_destructor(struct ctdb_queue *queue) -{ - TALLOC_FREE(queue->buffer.data); - queue->buffer.length = 0; - queue->buffer.size = 0; - if (queue->destroyed != NULL) - *queue->destroyed = true; - return 0; -} - /* setup a packet queue on a socket */ @@ -454,7 +442,6 @@ struct ctdb_queue *ctdb_queue_setup(struct ctdb_context *ctdb, return NULL; } } - talloc_set_destructor(queue, queue_destructor); queue->buffer_size = ctdb->tunable.queue_buffer_size; /* In client code, ctdb->tunable is not initialized. -- 2.34.1