s3: Remove smbd_messaging_context() from push_blocking_lock_request()
authorVolker Lendecke <vl@samba.org>
Sun, 4 Jul 2010 16:38:12 +0000 (18:38 +0200)
committerVolker Lendecke <vl@samba.org>
Mon, 5 Jul 2010 09:06:27 +0000 (11:06 +0200)
source3/smbd/blocking.c

index 5ee8a97175f0f1cf7af9bf30c8bcbe22f52f6568..a06f44f9a891139baf87f0987cf0071dcf2ac539 100644 (file)
@@ -222,7 +222,7 @@ bool push_blocking_lock_request( struct byte_range_lock *br_lck,
        blr->blr_private = NULL;
 
        /* Add a pending lock record for this. */
-       status = brl_lock(smbd_messaging_context(),
+       status = brl_lock(req->sconn->msg_ctx,
                        br_lck,
                        smblctx,
                        procid_self(),
@@ -248,7 +248,7 @@ bool push_blocking_lock_request( struct byte_range_lock *br_lck,
 
        /* Ensure we'll receive messages when this is unlocked. */
        if (!sconn->smb1.locks.blocking_lock_unlock_state) {
-               messaging_register(smbd_messaging_context(), NULL,
+               messaging_register(sconn->msg_ctx, NULL,
                                   MSG_SMB_UNLOCK, received_unlock_msg);
                sconn->smb1.locks.blocking_lock_unlock_state = true;
        }