[SCM] CTDB repository - branch master updated - e8f3431597bc9ec67387ea7e702d2d00f36007f0

[Andrew Tridgell]

The branch, master has been updated
       via  e8f3431597bc9ec67387ea7e702d2d00f36007f0 (commit)
       via  bc251ac7029c2689776a8c31b28ac1d233d52d4f (commit)
       via  2ef839c95a48cd8a5f0ed385e92bdb89de71b4a2 (commit)
      from  cb2c05d5d3f8908eecdad1ae6a1dc8efa1ffcb1e (commit)

http://gitweb.samba.org/?p=tridge/ctdb.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit e8f3431597bc9ec67387ea7e702d2d00f36007f0
Merge: cb2c05d5d3f8908eecdad1ae6a1dc8efa1ffcb1e bc251ac7029c2689776a8c31b28ac1d233d52d4f
Author: Andrew Tridgell <tridge at samba.org>
Date:   Thu May 8 17:15:41 2008 +1000

    Merge commit 'sofs1/tridge'

commit bc251ac7029c2689776a8c31b28ac1d233d52d4f
Author: root <root at h01c001mz.VSOFS1.COM>
Date:   Thu May 8 17:14:00 2008 +1000

    listen_fd is auto-closed
    
    Closing it here just causes an epoll error, and may close a fd in use by
    another structure to be closed. This caused a infinite recovery loop

commit 2ef839c95a48cd8a5f0ed385e92bdb89de71b4a2
Merge: badf34692449bf658cef488c0da6c3eb90187555 9e08ab6c9f54f5a2c5790927e9aff107ca85a2cc
Author: root <root at h01c001mz.VSOFS1.COM>
Date:   Thu May 8 16:46:23 2008 +1000

    Merge commit 'ronnie-ctdb/master' into tridge

-----------------------------------------------------------------------

Summary of changes:
 tcp/tcp_init.c |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/tcp/tcp_init.c b/tcp/tcp_init.c
index 527373c..5c53caf 100644
--- a/tcp/tcp_init.c
+++ b/tcp/tcp_init.c
@@ -147,9 +147,6 @@ static const struct ctdb_methods ctdb_tcp_methods = {
 
 static int tcp_ctcp_destructor(struct ctdb_tcp *ctcp)
 {
-	if (ctcp->listen_fd) {
-		close(ctcp->listen_fd);
-	}
 	ctcp->ctdb->private_data = NULL;
 	ctcp->ctdb->methods = NULL;
 	


-- 
CTDB repository