From 704cf106451466efe0b53254d152dad6fd8ac5ef Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Thu, 15 Dec 2011 11:51:20 +0100 Subject: s3:smbd: avoid using sconn_server_id() metze --- source3/smbd/smb2_lock.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'source3/smbd/smb2_lock.c') diff --git a/source3/smbd/smb2_lock.c b/source3/smbd/smb2_lock.c index 10b35df4a6..fdca266a27 100644 --- 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, -- cgit