From fe7c5198a25b7f4b65706d46e3c94cf982410edb Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Thu, 15 Dec 2011 11:50:43 +0100
Subject: [PATCH] s3:locking: avoid using sconn_server_id()

metze
---
 source3/locking/brlock.c  |  2 +-
 source3/locking/locking.c | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/source3/locking/brlock.c b/source3/locking/brlock.c
index 33c92438cd..a33d809286 100644
--- a/source3/locking/brlock.c
+++ b/source3/locking/brlock.c
@@ -1489,7 +1489,7 @@ void brl_close_fnum(struct messaging_context *msg_ctx,
 	int fnum = fsp->fnum;
 	unsigned int i;
 	struct lock_struct *locks = br_lck->lock_data;
-	struct server_id pid = sconn_server_id(fsp->conn->sconn);
+	struct server_id pid = messaging_server_id(fsp->conn->sconn->msg_ctx);
 	struct lock_struct *locks_copy;
 	unsigned int num_locks_copy;
 
diff --git a/source3/locking/locking.c b/source3/locking/locking.c
index 35ae7584a2..45c2ce9f40 100644
--- a/source3/locking/locking.c
+++ b/source3/locking/locking.c
@@ -96,7 +96,7 @@ void init_strict_lock_struct(files_struct *fsp,
 
 	plock->context.smblctx = smblctx;
         plock->context.tid = fsp->conn->cnum;
-        plock->context.pid = sconn_server_id(fsp->conn->sconn);
+        plock->context.pid = messaging_server_id(fsp->conn->sconn->msg_ctx);
         plock->start = start;
         plock->size = size;
         plock->fnum = fsp->fnum;
@@ -198,7 +198,7 @@ NTSTATUS query_lock(files_struct *fsp,
 
 	return brl_lockquery(br_lck,
 			psmblctx,
-			sconn_server_id(fsp->conn->sconn),
+			messaging_server_id(fsp->conn->sconn->msg_ctx),
 			poffset,
 			pcount,
 			plock_type,
@@ -284,7 +284,7 @@ struct byte_range_lock *do_lock(struct messaging_context *msg_ctx,
 	*perr = brl_lock(msg_ctx,
 			br_lck,
 			smblctx,
-			sconn_server_id(fsp->conn->sconn),
+			messaging_server_id(fsp->conn->sconn->msg_ctx),
 			offset,
 			count,
 			lock_type,
@@ -333,7 +333,7 @@ NTSTATUS do_unlock(struct messaging_context *msg_ctx,
 	ok = brl_unlock(msg_ctx,
 			br_lck,
 			smblctx,
-			sconn_server_id(fsp->conn->sconn),
+			messaging_server_id(fsp->conn->sconn->msg_ctx),
 			offset,
 			count,
 			lock_flav);
@@ -383,7 +383,7 @@ NTSTATUS do_lock_cancel(files_struct *fsp,
 
 	ok = brl_lock_cancel(br_lck,
 			smblctx,
-			sconn_server_id(fsp->conn->sconn),
+			messaging_server_id(fsp->conn->sconn->msg_ctx),
 			offset,
 			count,
 			lock_flav,
@@ -959,7 +959,7 @@ static void fill_share_mode_entry(struct share_mode_entry *e,
 				  uid_t uid, uint64_t mid, uint16 op_type)
 {
 	ZERO_STRUCTP(e);
-	e->pid = sconn_server_id(fsp->conn->sconn);
+	e->pid = messaging_server_id(fsp->conn->sconn->msg_ctx);
 	e->share_access = fsp->share_access;
 	e->private_options = fsp->fh->private_options;
 	e->access_mask = fsp->access_mask;
-- 
2.34.1