[PATCH 2/4] s3-brlock: we don't need these MSG_SMB_UNLOCK calls now

[Andrew Tridgell]

These have been replaced with the min timeout in blocking.c
---
 source3/lib/ctdbd_conn.c |    8 --------
 source3/smbd/server.c    |    2 --
 2 files changed, 0 insertions(+), 10 deletions(-)

diff --git a/source3/lib/ctdbd_conn.c b/source3/lib/ctdbd_conn.c
index 84bba3b..8ddb12a 100644
--- a/source3/lib/ctdbd_conn.c
+++ b/source3/lib/ctdbd_conn.c
@@ -542,15 +542,7 @@ static NTSTATUS ctdb_handle_message(uint8_t *buf, size_t length,
 		messaging_send(conn->msg_ctx, procid_self(),
 			       MSG_SMB_BRL_VALIDATE, &data_blob_null);
 
-		/*
-		 * it's possible that we have just rejoined the cluster after
-		 * an outage. In that case our pending locks could have been
-		 * removed from the lockdb, so retry them once more
-		 */
-		message_send_all(conn->msg_ctx, MSG_SMB_UNLOCK, NULL, 0, NULL);
-
 		TALLOC_FREE(buf);
-
 		return NT_STATUS_OK;
 	}
 
diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index fb0efd2..8a7a3b2 100644
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -230,8 +230,6 @@ static void remove_child_pid(pid_t pid, bool unclean_shutdown)
 		DEBUG(3,(__location__ " Unclean shutdown of pid %u\n", (unsigned int)pid));
 		messaging_send_buf(smbd_messaging_context(), procid_self(), 
 				   MSG_SMB_BRL_VALIDATE, NULL, 0);
-		message_send_all(smbd_messaging_context(), 
-				 MSG_SMB_UNLOCK, NULL, 0, NULL);
 	}
 
 	for (child = children; child != NULL; child = child->next) {
-- 
1.6.3.3


--0F1p//8PRICkK4MW
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment; filename="0003-s3-smbd-add-a-rate-limited-cleanup-of-brl-connection.patch"