r22846: Chunk one to replace message_send_pid with messaging_send: Deep inside

[sfrench/samba-autobuild/.git] / source / smbd / blocking.c

diff --git a/source/smbd/blocking.c b/source/smbd/blocking.c
index d0caa29597d0ad157ba7708faeb05840042304cf..ab2b0949bd6c7d2fa921f6b0575b9ff656a1ea4d 100644 (file)
--- a/source/smbd/blocking.c
+++ b/source/smbd/blocking.c
@@ -73,7 +73,7 @@ static BOOL in_chained_smb(void)
        return (chain_size != 0);
 }
 
-static void received_unlock_msg(int msg_type, struct process_id src,
+static void received_unlock_msg(int msg_type, struct server_id src,
                                void *buf, size_t len,
                                void *private_data);
 static void process_blocking_lock_queue(void);
@@ -195,7 +195,7 @@ BOOL push_blocking_lock_request( struct byte_range_lock *br_lck,
        blr->length = length;
 
        /* Add a pending lock record for this. */
-       status = brl_lock(br_lck,
+       status = brl_lock(smbd_messaging_context(), br_lck,
                        lock_pid,
                        procid_self(),
                        offset,
@@ -355,7 +355,8 @@ static void reply_lockingX_error(blocking_lock_record *blr, NTSTATUS status)
                 * request would never have been queued. JRA.
                 */
                
-               do_unlock(fsp,
+               do_unlock(smbd_messaging_context(),
+                       fsp,
                        lock_pid,
                        count,
                        offset,
@@ -435,7 +436,8 @@ static BOOL process_lockingX(blocking_lock_record *blr)
                 * request would never have been queued. JRA.
                 */
                errno = 0;
-               br_lck = do_lock(fsp,
+               br_lck = do_lock(smbd_messaging_context(),
+                               fsp,
                                lock_pid,
                                count,
                                offset, 
@@ -496,7 +498,8 @@ static BOOL process_trans2(blocking_lock_record *blr)
        char *outbuf;
        char params[2];
        NTSTATUS status;
-       struct byte_range_lock *br_lck = do_lock(blr->fsp,
+       struct byte_range_lock *br_lck = do_lock(smbd_messaging_context(),
+                                               blr->fsp,
                                                blr->lock_pid,
                                                blr->count,
                                                blr->offset,
@@ -645,7 +648,7 @@ BOOL blocking_lock_was_deferred(int mid)
   Set a flag as an unlock request affects one of our pending locks.
 *****************************************************************************/
 
-static void received_unlock_msg(int msg_type, struct process_id src,
+static void received_unlock_msg(int msg_type, struct server_id src,
                                void *buf, size_t len,
                                void *private_data)
 {
@@ -807,7 +810,7 @@ static void process_blocking_lock_queue(void)
 #define MSG_BLOCKING_LOCK_CANCEL_SIZE (sizeof(blocking_lock_record *) + sizeof(NTSTATUS))
 
 static void process_blocking_lock_cancel_message(int msg_type,
-                                                struct process_id src,
+                                                struct server_id src,
                                                 void *buf, size_t len,
                                                 void *private_data)
 {