ctdb: remove queue destructor as it isn't needed anymore
authorSwen Schillig <swen@vnet.ibm.com>
Mon, 12 Mar 2018 10:00:55 +0000 (11:00 +0100)
committerMartin Schwenke <martins@samba.org>
Mon, 6 Aug 2018 09:37:32 +0000 (11:37 +0200)
After

commit e097b7f8ff1a9992de1d11474dac4969e30cd679
Author: David Disseldorp <ddiss@suse.de>
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 <swen@vnet.ibm.com>
Reviewed-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: David Disseldorp <ddiss@samba.org>
Autobuild-User(master): Martin Schwenke <martins@samba.org>
Autobuild-Date(master): Mon Aug  6 11:37:32 CEST 2018 on sn-devel-144

ctdb/common/ctdb_io.c

index c6941241883c18c05671ba1d305c2745efeee95a..da444aca2b69c91db279836e576b54711fa44353 100644 (file)
@@ -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.