[PATCH] messaging: Nobody uses G_LOCK_RETRY anymore

[Volker Lendecke]

Hi!

The attached patch removes the definition of the unused
MSG_G_LOCK_RETRY messaging type.

Review would be appreciated!

Thanks,

Volker

-- 
SerNet GmbH, Bahnhofsallee 1b, 37081 Göttingen
phone: +49-551-370000-0, fax: +49-551-370000-9
AG Göttingen, HRB 2816, GF: Dr. Johannes Loxen
http://www.sernet.de, mailto:kontakt at sernet.de
-------------- next part --------------
From e532b6b653ac613b0bc1813a5b1d11944243aae3 Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vl at samba.org>
Date: Tue, 6 May 2014 09:57:31 +0200
Subject: [PATCH] messaging: Nobody uses G_LOCK_RETRY anymore

Signed-off-by: Volker Lendecke <vl at samba.org>
---
 source3/lib/ctdbd_conn.c         |    9 ---------
 source3/librpc/idl/messaging.idl |    2 +-
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/source3/lib/ctdbd_conn.c b/source3/lib/ctdbd_conn.c
index bde9dae..fae3f90 100644
--- a/source3/lib/ctdbd_conn.c
+++ b/source3/lib/ctdbd_conn.c
@@ -469,10 +469,6 @@ static NTSTATUS ctdb_read_req(struct ctdbd_connection *conn, uint32_t reqid,
 			messaging_send(conn->msg_ctx,
 				       messaging_server_id(conn->msg_ctx),
 				       MSG_SMB_BRL_VALIDATE, &data_blob_null);
-			messaging_send(conn->msg_ctx,
-				       messaging_server_id(conn->msg_ctx),
-				       MSG_DBWRAP_G_LOCK_RETRY,
-				       &data_blob_null);
 			TALLOC_FREE(hdr);
 			goto next_pkt;
 		}
@@ -686,11 +682,6 @@ static NTSTATUS ctdb_handle_message(uint8_t *buf, size_t length,
 			       messaging_server_id(conn->msg_ctx),
 			       MSG_SMB_BRL_VALIDATE, &data_blob_null);
 
-		messaging_send(conn->msg_ctx,
-			       messaging_server_id(conn->msg_ctx),
-			       MSG_DBWRAP_G_LOCK_RETRY,
-			       &data_blob_null);
-
 		TALLOC_FREE(buf);
 		return NT_STATUS_OK;
 	}
diff --git a/source3/librpc/idl/messaging.idl b/source3/librpc/idl/messaging.idl
index 9405d53..a396b5b 100644
--- a/source3/librpc/idl/messaging.idl
+++ b/source3/librpc/idl/messaging.idl
@@ -118,7 +118,7 @@ interface messaging
 
 		/* dbwrap messages 4001-4999 (0x0FA0 - 0x1387) */
 		/* MSG_DBWRAP_TDB2_CHANGES		= 4001, */
-		MSG_DBWRAP_G_LOCK_RETRY		= 4002,
+		/* MSG_DBWRAP_G_LOCK_RETRY		= 4002, */
 		MSG_DBWRAP_MODIFIED		= 4003
 	} messaging_type;
 
-- 
1.7.9.5