s3:locking: avoid using sconn_server_id()

metze

diff --git a/source3/locking/brlock.c b/source3/locking/brlock.c
index 33c92438cd3470505bed163d032886a12a693e3f..a33d809286f50785db883ceab39e03d591956f8b 100644 (file)
--- 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 35ae7584a268b02670a61dc6ce9feeffe5121525..45c2ce9f4076fb5086eed3ac39555d50f4af3ddd 100644 (file)
--- 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;