ctdb-locking: Remove unused structure members
authorAmitay Isaacs <amitay@gmail.com>
Fri, 30 May 2014 03:57:44 +0000 (13:57 +1000)
committerVolker Lendecke <vl@samba.org>
Mon, 4 Aug 2014 15:59:52 +0000 (17:59 +0200)
block_child was used to keep track of a process which was created to debug
why a lock process has blocked.  That logic was replaced to execute an
external debug script.

Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Volker Lendecke <vl@samba.org>
ctdb/server/ctdb_lock.c

index 5579fb9bb04d7d8d2fb8ccf774c987408e964fd0..d6beed86b51ca9543f9b21120a1140c43fafcaf6 100644 (file)
@@ -76,8 +76,6 @@ struct lock_context {
        int fd[2];
        struct tevent_fd *tfd;
        struct tevent_timer *ttimer;
-       pid_t block_child;
-       int block_fd[2];
        struct timeval start_time;
        uint32_t key_hash;
 };
@@ -941,7 +939,6 @@ static struct lock_request *ctdb_lock_internal(struct ctdb_context *ctdb,
                lock_ctx->auto_mark = auto_mark;
 
                lock_ctx->child = -1;
-               lock_ctx->block_child = -1;
 
                DLIST_ADD_END(ctdb->lock_pending, lock_ctx, NULL);
                ctdb->lock_num_pending++;