s3:smbd: avoid using sconn_server_id()

[mat/samba.git] / source3 / smbd / smb2_lock.c

diff --git a/source3/smbd/smb2_lock.c b/source3/smbd/smb2_lock.c
index 10b35df4a60ceac236c47b4ff78bf1915eea0fd1..fdca266a2764f35153c286578a9e9e57fe0b5e55 100644 (file)
--- a/source3/smbd/smb2_lock.c
+++ b/source3/smbd/smb2_lock.c
@@ -637,7 +637,7 @@ bool push_blocking_lock_request_smb2( struct byte_range_lock *br_lck,
        status = brl_lock(sconn->msg_ctx,
                        br_lck,
                        smblctx,
-                       sconn_server_id(sconn),
+                       messaging_server_id(sconn->msg_ctx),
                        offset,
                        count,
                        lock_type == READ_LOCK ? PENDING_READ_LOCK : PENDING_WRITE_LOCK,
@@ -689,7 +689,7 @@ static void remove_pending_lock(struct smbd_smb2_lock_state *state,
        if (br_lck) {
                brl_lock_cancel(br_lck,
                                blr->smblctx,
-                               sconn_server_id(blr->fsp->conn->sconn),
+                               messaging_server_id(blr->fsp->conn->sconn->msg_ctx),
                                blr->offset,
                                blr->count,
                                blr->lock_flav,
@@ -909,7 +909,7 @@ void cancel_pending_lock_requests_by_fid_smb2(files_struct *fsp,
                /* Remove the entries from the lock db. */
                brl_lock_cancel(br_lck,
                                blr->smblctx,
-                               sconn_server_id(sconn),
+                               messaging_server_id(sconn->msg_ctx),
                                blr->offset,
                                blr->count,
                                blr->lock_flav,