[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  dcb3f21 messaging: Nobody uses G_LOCK_RETRY anymore
      from  9d4adbc6 build: find blkcnt_t size via array

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


- Log -----------------------------------------------------------------
commit dcb3f2150e1b983c4d85623ff98b103e074d1331
Author: Volker Lendecke <vl at samba.org>
Date:   Tue May 6 09:57:31 2014 +0200

    messaging: Nobody uses G_LOCK_RETRY anymore
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>
    
    Autobuild-User(master): Jeremy Allison <jra at samba.org>
    Autobuild-Date(master): Tue May  6 23:01:22 CEST 2014 on sn-devel-104

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

Summary of changes:
 source3/lib/ctdbd_conn.c         |    9 ---------
 source3/librpc/idl/messaging.idl |    2 +-
 2 files changed, 1 insertions(+), 10 deletions(-)


Changeset truncated at 500 lines:

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;
 


-- 
Samba Shared Repository