s3/smbd: change locking behavior when "lock spin time = 0".
[abartlet/samba.git/.git] / source3 / smbd / blocking.c
index e143999a785d2d38c7f3dcafcdf01740a35df2ae..cb48cc8c1ceb54fb61265c3aa451dbd20c7a73dd 100644 (file)
    Unix SMB/CIFS implementation.
    Blocking Locking functions
    Copyright (C) Jeremy Allison 1998-2003
-   
+
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "includes.h"
+#include "smbd/globals.h"
 
-extern char *OutBuffer;
+#undef DBGC_CLASS
+#define DBGC_CLASS DBGC_LOCKING
 
 /****************************************************************************
- This is the structure to queue to implement blocking locks.
- notify. It consists of the requesting SMB and the expiry time.
-*****************************************************************************/
+ Determine if this is a secondary element of a chained SMB.
+  **************************************************************************/
 
-typedef struct _blocking_lock_record {
-       struct _blocking_lock_record *next;
-       struct _blocking_lock_record *prev;
-       int com_type;
-       files_struct *fsp;
-       time_t expire_time;
-       int lock_num;
-       SMB_BIG_UINT offset;
-       SMB_BIG_UINT count;
-       uint16 lock_pid;
-       char *inbuf;
-       int length;
-} blocking_lock_record;
-
-static blocking_lock_record *blocking_lock_queue;
+static void received_unlock_msg(struct messaging_context *msg,
+                               void *private_data,
+                               uint32_t msg_type,
+                               struct server_id server_id,
+                               DATA_BLOB *data);
 
-/****************************************************************************
- Destructor for the above structure.
-****************************************************************************/
-
-static void free_blocking_lock_record(blocking_lock_record *blr)
+static void brl_timeout_fn(struct event_context *event_ctx,
+                          struct timed_event *te,
+                          struct timeval now,
+                          void *private_data)
 {
-       DLIST_REMOVE(blocking_lock_queue, blr);
-       SAFE_FREE(blr->inbuf);
-       SAFE_FREE(blr);
+       SMB_ASSERT(brl_timeout == te);
+       TALLOC_FREE(brl_timeout);
+
+       change_to_root_user();  /* TODO: Possibly run all timed events as
+                                * root */
+
+       process_blocking_lock_queue();
 }
 
 /****************************************************************************
Get the files_struct given a particular queued SMB.
-*****************************************************************************/
We need a version of timeval_min that treats zero timval as infinite.
+****************************************************************************/
 
-static files_struct *get_fsp_from_pkt(char *inbuf)
+static struct timeval timeval_brl_min(const struct timeval *tv1,
+                                       const struct timeval *tv2)
 {
-       switch(CVAL(inbuf,smb_com)) {
-               case SMBlock:
-               case SMBlockread:
-                       return file_fsp(inbuf,smb_vwv0);
-               case SMBlockingX:
-                       return file_fsp(inbuf,smb_vwv2);
-               default:
-                       DEBUG(0,("get_fsp_from_pkt: PANIC - unknown type on blocking lock queue - exiting.!\n"));
-                       exit_server("PANIC - unknown type on blocking lock queue");
+       if (timeval_is_zero(tv1)) {
+               return *tv2;
        }
-       return NULL; /* Keep compiler happy. */
+       if (timeval_is_zero(tv2)) {
+               return *tv1;
+       }
+       return timeval_min(tv1, tv2);
 }
 
 /****************************************************************************
- Determine if this is a secondary element of a chained SMB.
-  **************************************************************************/
+ After a change to blocking_lock_queue, recalculate the timed_event for the
+ next processing.
+****************************************************************************/
 
-static BOOL in_chained_smb(void)
+static bool recalc_brl_timeout(void)
 {
-       return (chain_size != 0);
+       struct blocking_lock_record *blr;
+       struct timeval next_timeout;
+       int max_brl_timeout = lp_parm_int(-1, "brl", "recalctime", 5);
+
+       TALLOC_FREE(brl_timeout);
+
+       next_timeout = timeval_zero();
+
+       for (blr = blocking_lock_queue; blr; blr = blr->next) {
+               if (timeval_is_zero(&blr->expire_time)) {
+                       /*
+                        * If we're blocked on pid 0xFFFFFFFF this is
+                        * a POSIX lock, so calculate a timeout of
+                        * 10 seconds into the future.
+                        */
+                        if (blr->blocking_pid == 0xFFFFFFFF) {
+                               struct timeval psx_to = timeval_current_ofs(10, 0);
+                               next_timeout = timeval_brl_min(&next_timeout, &psx_to);
+                        }
+
+                       continue;
+               }
+
+               next_timeout = timeval_brl_min(&next_timeout, &blr->expire_time);
+       }
+
+       if (timeval_is_zero(&next_timeout)) {
+               DEBUG(10, ("Next timeout = Infinite.\n"));
+               return True;
+       }
+
+       /* 
+        to account for unclean shutdowns by clients we need a
+        maximum timeout that we use for checking pending locks. If
+        we have any pending locks at all, then check if the pending
+        lock can continue at least every brl:recalctime seconds
+        (default 5 seconds).
+
+        This saves us needing to do a message_send_all() in the
+        SIGCHLD handler in the parent daemon. That
+        message_send_all() caused O(n^2) work to be done when IP
+        failovers happened in clustered Samba, which could make the
+        entire system unusable for many minutes.
+       */
+
+       if (max_brl_timeout > 0) {
+               struct timeval min_to = timeval_current_ofs(max_brl_timeout, 0);
+               next_timeout = timeval_min(&next_timeout, &min_to);
+       }
+
+       if (DEBUGLVL(10)) {
+               struct timeval cur, from_now;
+
+               cur = timeval_current();
+               from_now = timeval_until(&cur, &next_timeout);
+               DEBUG(10, ("Next timeout = %d.%d seconds from now.\n",
+                   (int)from_now.tv_sec, (int)from_now.tv_usec));
+       }
+
+       if (!(brl_timeout = event_add_timed(smbd_event_context(), NULL,
+                                           next_timeout,
+                                           brl_timeout_fn, NULL))) {
+               return False;
+       }
+
+       return True;
 }
 
-static void received_unlock_msg(int msg_type, pid_t src, void *buf, size_t len);
 
 /****************************************************************************
  Function to push a blocking lock request onto the lock queue.
 ****************************************************************************/
 
-BOOL push_blocking_lock_request( char *inbuf, int length, int lock_timeout,
-               int lock_num, uint16 lock_pid, SMB_BIG_UINT offset, SMB_BIG_UINT count)
+bool push_blocking_lock_request( struct byte_range_lock *br_lck,
+               struct smb_request *req,
+               files_struct *fsp,
+               int lock_timeout,
+               int lock_num,
+               uint32_t lock_pid,
+               enum brl_type lock_type,
+               enum brl_flavour lock_flav,
+               uint64_t offset,
+               uint64_t count,
+               uint32_t blocking_pid)
 {
-       static BOOL set_lock_msg;
-       blocking_lock_record *blr, *tmp;
-       BOOL my_lock_ctx = False;
+       struct blocking_lock_record *blr;
        NTSTATUS status;
 
-       if(in_chained_smb() ) {
+       if(req_is_in_chain(req)) {
                DEBUG(0,("push_blocking_lock_request: cannot queue a chained request (currently).\n"));
                return False;
        }
@@ -106,82 +168,82 @@ BOOL push_blocking_lock_request( char *inbuf, int length, int lock_timeout,
         * the expiration time here.
         */
 
-       if((blr = (blocking_lock_record *)malloc(sizeof(blocking_lock_record))) == NULL) {
+       blr = talloc(NULL, struct blocking_lock_record);
+       if (blr == NULL) {
                DEBUG(0,("push_blocking_lock_request: Malloc fail !\n" ));
                return False;
        }
 
-       if((blr->inbuf = (char *)malloc(length)) == NULL) {
-               DEBUG(0,("push_blocking_lock_request: Malloc fail (2)!\n" ));
-               SAFE_FREE(blr);
-               return False;
-       }
+       blr->next = NULL;
+       blr->prev = NULL;
 
-       blr->com_type = CVAL(inbuf,smb_com);
-       blr->fsp = get_fsp_from_pkt(inbuf);
-       blr->expire_time = (lock_timeout == -1) ? (time_t)-1 : time(NULL) + (time_t)lock_timeout;
+       blr->fsp = fsp;
+       if (lock_timeout == -1) {
+               blr->expire_time.tv_sec = 0;
+               blr->expire_time.tv_usec = 0; /* Never expire. */
+       } else {
+               blr->expire_time = timeval_current_ofs(lock_timeout/1000,
+                                       (lock_timeout % 1000) * 1000);
+       }
        blr->lock_num = lock_num;
        blr->lock_pid = lock_pid;
+       blr->blocking_pid = blocking_pid;
+       blr->lock_flav = lock_flav;
+       blr->lock_type = lock_type;
        blr->offset = offset;
        blr->count = count;
-       memcpy(blr->inbuf, inbuf, length);
-       blr->length = length;
+      
+       /* Specific brl_lock() implementations can fill this in. */
+       blr->blr_private = NULL;
 
        /* Add a pending lock record for this. */
-       status = brl_lock(blr->fsp->dev, blr->fsp->inode, blr->fsp->fnum,
-                       lock_pid, sys_getpid(), blr->fsp->conn->cnum,
-                       offset, count, PENDING_LOCK, &my_lock_ctx);
+       status = brl_lock(smbd_messaging_context(),
+                       br_lck,
+                       lock_pid,
+                       procid_self(),
+                       offset,
+                       count,
+                       lock_type == READ_LOCK ? PENDING_READ_LOCK : PENDING_WRITE_LOCK,
+                       blr->lock_flav,
+                       True,
+                       NULL,
+                       blr);
 
        if (!NT_STATUS_IS_OK(status)) {
                DEBUG(0,("push_blocking_lock_request: failed to add PENDING_LOCK record.\n"));
-               free_blocking_lock_record(blr);
+               TALLOC_FREE(blr);
                return False;
        }
 
-       DLIST_ADD_END(blocking_lock_queue, blr, tmp);
+       SMB_PERFCOUNT_DEFER_OP(&req->pcd, &req->pcd);
+       blr->req = talloc_move(blr, &req);
+
+       DLIST_ADD_END(blocking_lock_queue, blr, struct blocking_lock_record *);
+       recalc_brl_timeout();
 
        /* Ensure we'll receive messages when this is unlocked. */
-       if (!set_lock_msg) {
-               message_register(MSG_SMB_UNLOCK, received_unlock_msg);
-               set_lock_msg = True;
+       if (!blocking_lock_unlock_state) {
+               messaging_register(smbd_messaging_context(), NULL,
+                                  MSG_SMB_UNLOCK, received_unlock_msg);
+               blocking_lock_unlock_state = true;
        }
 
-       DEBUG(3,("push_blocking_lock_request: lock request length=%d blocked with expiry time %d (+%d) \
-for fnum = %d, name = %s\n", length, (int)blr->expire_time, lock_timeout,
-               blr->fsp->fnum, blr->fsp->fsp_name ));
-
-       /* Push the MID of this packet on the signing queue. */
-       srv_defer_sign_response(SVAL(inbuf,smb_mid));
+       DEBUG(3,("push_blocking_lock_request: lock request blocked with "
+               "expiry time (%u sec. %u usec) (+%d msec) for fnum = %d, name = %s\n",
+               (unsigned int)blr->expire_time.tv_sec,
+               (unsigned int)blr->expire_time.tv_usec, lock_timeout,
+               blr->fsp->fnum, fsp_str_dbg(blr->fsp)));
 
        return True;
 }
 
-/****************************************************************************
- Return a smd with a given size.
-*****************************************************************************/
-
-static void send_blocking_reply(char *outbuf, int outsize)
-{
-       if(outsize > 4)
-               smb_setlen(outbuf,outsize - 4);
-
-       if (!send_smb(smbd_server_fd(),outbuf))
-               exit_server("send_blocking_reply: send_smb failed.");
-}
-
 /****************************************************************************
  Return a lockingX success SMB.
 *****************************************************************************/
 
-static void reply_lockingX_success(blocking_lock_record *blr)
+static void reply_lockingX_success(struct blocking_lock_record *blr)
 {
-       char *outbuf = OutBuffer;
-       int bufsize = BUFFER_SIZE;
-       char *inbuf = blr->inbuf;
-       int outsize = 0;
-
-       construct_reply_common(inbuf, outbuf);
-       set_message(outbuf,2,0,True);
+       reply_outbuf(blr->req, 2, 0);
 
        /*
         * As this message is a lockingX call we must handle
@@ -191,32 +253,45 @@ static void reply_lockingX_success(blocking_lock_record *blr)
         * that here and must set up the chain info manually.
         */
 
-       outsize = chain_reply(inbuf,outbuf,blr->length,bufsize);
-
-       outsize += chain_size;
-
-       send_blocking_reply(outbuf,outsize);
+       chain_reply(blr->req);
+       TALLOC_FREE(blr->req->outbuf);
 }
 
 /****************************************************************************
  Return a generic lock fail error blocking call.
 *****************************************************************************/
 
-static void generic_blocking_lock_error(blocking_lock_record *blr, NTSTATUS status)
+static void generic_blocking_lock_error(struct blocking_lock_record *blr, NTSTATUS status)
 {
-       char *outbuf = OutBuffer;
-       char *inbuf = blr->inbuf;
-       construct_reply_common(inbuf, outbuf);
-
        /* whenever a timeout is given w2k maps LOCK_NOT_GRANTED to
           FILE_LOCK_CONFLICT! (tridge) */
        if (NT_STATUS_EQUAL(status, NT_STATUS_LOCK_NOT_GRANTED)) {
                status = NT_STATUS_FILE_LOCK_CONFLICT;
        }
 
-       ERROR_NT(status);
-       if (!send_smb(smbd_server_fd(),outbuf))
-               exit_server("generic_blocking_lock_error: send_smb failed.");
+       if (NT_STATUS_EQUAL(status, NT_STATUS_FILE_LOCK_CONFLICT)) {
+               /* Store the last lock error. */
+               files_struct *fsp = blr->fsp;
+
+               if (fsp) {
+                       fsp->last_lock_failure.context.smbpid = blr->lock_pid;
+                       fsp->last_lock_failure.context.tid = fsp->conn->cnum;
+                       fsp->last_lock_failure.context.pid = procid_self();
+                       fsp->last_lock_failure.start = blr->offset;
+                       fsp->last_lock_failure.size = blr->count;
+                       fsp->last_lock_failure.fnum = fsp->fnum;
+                       fsp->last_lock_failure.lock_type = READ_LOCK; /* Don't care. */
+                       fsp->last_lock_failure.lock_flav = blr->lock_flav;
+               }
+       }
+
+       reply_nterror(blr->req, status);
+       if (!srv_send_smb(smbd_server_fd(), (char *)blr->req->outbuf,
+                         true, blr->req->seqnum+1,
+                         blr->req->encrypted, NULL)) {
+               exit_server_cleanly("generic_blocking_lock_error: srv_send_smb failed.");
+       }
+       TALLOC_FREE(blr->req->outbuf);
 }
 
 /****************************************************************************
@@ -224,21 +299,20 @@ static void generic_blocking_lock_error(blocking_lock_record *blr, NTSTATUS stat
  obtained first.
 *****************************************************************************/
 
-static void reply_lockingX_error(blocking_lock_record *blr, NTSTATUS status)
+static void reply_lockingX_error(struct blocking_lock_record *blr, NTSTATUS status)
 {
-       char *inbuf = blr->inbuf;
        files_struct *fsp = blr->fsp;
-       connection_struct *conn = conn_find(SVAL(inbuf,smb_tid));
-       uint16 num_ulocks = SVAL(inbuf,smb_vwv6);
-       SMB_BIG_UINT count = (SMB_BIG_UINT)0, offset = (SMB_BIG_UINT) 0;
-       uint16 lock_pid;
-       unsigned char locktype = CVAL(inbuf,smb_vwv3);
-       BOOL large_file_format = (locktype & LOCKING_ANDX_LARGE_FILES);
-       char *data;
+       uint16 num_ulocks = SVAL(blr->req->vwv+6, 0);
+       uint64_t count = (uint64_t)0, offset = (uint64_t) 0;
+       uint32 lock_pid;
+       unsigned char locktype = CVAL(blr->req->vwv+3, 0);
+       bool large_file_format = (locktype & LOCKING_ANDX_LARGE_FILES);
+       uint8_t *data;
        int i;
 
-       data = smb_buf(inbuf) + ((large_file_format ? 20 : 10)*num_ulocks);
-       
+       data = (uint8_t *)blr->req->buf
+               + ((large_file_format ? 20 : 10)*num_ulocks);
+
        /* 
         * Data now points at the beginning of the list
         * of smb_lkrng structs.
@@ -249,22 +323,27 @@ static void reply_lockingX_error(blocking_lock_record *blr, NTSTATUS status)
         * as under POSIX rules, if we have a lock already there, we
         * will delete it (and we shouldn't) .....
         */
-       
+
        for(i = blr->lock_num - 1; i >= 0; i--) {
-               BOOL err;
-               
+               bool err;
+
                lock_pid = get_lock_pid( data, i, large_file_format);
                count = get_lock_count( data, i, large_file_format);
                offset = get_lock_offset( data, i, large_file_format, &err);
-               
+
                /*
                 * We know err cannot be set as if it was the lock
                 * request would never have been queued. JRA.
                 */
-               
-               do_unlock(fsp,conn,lock_pid,count,offset);
+
+               do_unlock(smbd_messaging_context(),
+                       fsp,
+                       lock_pid,
+                       count,
+                       offset,
+                       WINDOWS_LOCK);
        }
-       
+
        generic_blocking_lock_error(blr, status);
 }
 
@@ -272,146 +351,38 @@ static void reply_lockingX_error(blocking_lock_record *blr, NTSTATUS status)
  Return a lock fail error.
 *****************************************************************************/
 
-static void blocking_lock_reply_error(blocking_lock_record *blr, NTSTATUS status)
+static void blocking_lock_reply_error(struct blocking_lock_record *blr, NTSTATUS status)
 {
-       switch(blr->com_type) {
-       case SMBlock:
-       case SMBlockread:
-               generic_blocking_lock_error(blr, status);
-               break;
+       DEBUG(10, ("Replying with error=%s. BLR = %p\n", nt_errstr(status), blr));
+
+       switch(blr->req->cmd) {
        case SMBlockingX:
                reply_lockingX_error(blr, status);
                break;
-       default:
-               DEBUG(0,("blocking_lock_reply_error: PANIC - unknown type on blocking lock queue - exiting.!\n"));
-               exit_server("PANIC - unknown type on blocking lock queue");
-       }
-}
-
-/****************************************************************************
- Attempt to finish off getting all pending blocking locks for a lockread call.
- Returns True if we want to be removed from the list.
-*****************************************************************************/
-
-static BOOL process_lockread(blocking_lock_record *blr)
-{
-       char *outbuf = OutBuffer;
-       char *inbuf = blr->inbuf;
-       ssize_t nread = -1;
-       char *data, *p;
-       int outsize = 0;
-       SMB_BIG_UINT startpos;
-       size_t numtoread;
-       NTSTATUS status;
-       connection_struct *conn = conn_find(SVAL(inbuf,smb_tid));
-       files_struct *fsp = blr->fsp;
-       BOOL my_lock_ctx = False;
-
-       numtoread = SVAL(inbuf,smb_vwv1);
-       startpos = (SMB_BIG_UINT)IVAL(inbuf,smb_vwv2);
-       
-       numtoread = MIN(BUFFER_SIZE-outsize,numtoread);
-       data = smb_buf(outbuf) + 3;
-       status = do_lock_spin( fsp, conn, SVAL(inbuf,smb_pid), (SMB_BIG_UINT)numtoread, startpos, READ_LOCK, &my_lock_ctx);
-       if (NT_STATUS_V(status)) {
-               if (!NT_STATUS_EQUAL(status,NT_STATUS_LOCK_NOT_GRANTED) &&
-                       !NT_STATUS_EQUAL(status,NT_STATUS_FILE_LOCK_CONFLICT)) {
-                       /*
-                        * We have other than a "can't get lock"
-                        * error. Send an error.
-                        * Return True so we get dequeued.
-                        */
-                       generic_blocking_lock_error(blr, status);
-                       return True;
-               }
+       case SMBtrans2:
+       case SMBtranss2:
+               reply_nterror(blr->req, status);
 
                /*
-                * Still waiting for lock....
+                * construct_reply_common has done us the favor to pre-fill
+                * the command field with SMBtranss2 which is wrong :-)
                 */
-               
-               DEBUG(10,("process_lockread: failed to get lock for file = %s. Still waiting....\n",
-                         fsp->fsp_name));
-               return False;
-       }
-
-       nread = read_file(fsp,data,startpos,numtoread);
-
-       if (nread < 0) {
-               generic_blocking_lock_error(blr,NT_STATUS_ACCESS_DENIED);
-               return True;
-       }
-       
-       construct_reply_common(inbuf, outbuf);
-       outsize = set_message(outbuf,5,0,True);
-       
-       outsize += nread;
-       SSVAL(outbuf,smb_vwv0,nread);
-       SSVAL(outbuf,smb_vwv5,nread+3);
-       p = smb_buf(outbuf);
-       *p++ = 1;
-       SSVAL(p,0,nread); p += 2;
-       set_message_end(outbuf, p+nread);
-       
-       DEBUG(3, ( "process_lockread file = %s, fnum=%d num=%d nread=%d\n",
-                  fsp->fsp_name, fsp->fnum, (int)numtoread, (int)nread ) );
-       
-       send_blocking_reply(outbuf,outsize);
-       return True;
-}
-
-/****************************************************************************
- Attempt to finish off getting all pending blocking locks for a lock call.
- Returns True if we want to be removed from the list.
-*****************************************************************************/
-
-static BOOL process_lock(blocking_lock_record *blr)
-{
-       char *outbuf = OutBuffer;
-       char *inbuf = blr->inbuf;
-       int outsize;
-       SMB_BIG_UINT count = (SMB_BIG_UINT)0, offset = (SMB_BIG_UINT)0;
-       NTSTATUS status;
-       connection_struct *conn = conn_find(SVAL(inbuf,smb_tid));
-       files_struct *fsp = blr->fsp;
-       BOOL my_lock_ctx = False;
-
-       count = IVAL_TO_SMB_OFF_T(inbuf,smb_vwv1);
-       offset = IVAL_TO_SMB_OFF_T(inbuf,smb_vwv3);
-
-       errno = 0;
-       status = do_lock_spin(fsp, conn, SVAL(inbuf,smb_pid), count, offset, WRITE_LOCK, &my_lock_ctx);
-       if (NT_STATUS_IS_ERR(status)) {
-               if (!NT_STATUS_EQUAL(status,NT_STATUS_LOCK_NOT_GRANTED) &&
-                       !NT_STATUS_EQUAL(status,NT_STATUS_FILE_LOCK_CONFLICT)) {
-                       /*
-                        * We have other than a "can't get lock"
-                        * error. Send an error.
-                        * Return True so we get dequeued.
-                        */
-                       
-                       blocking_lock_reply_error(blr, status);
-                       return True;
+               SCVAL(blr->req->outbuf,smb_com,SMBtrans2);
+
+               if (!srv_send_smb(smbd_server_fd(),
+                                 (char *)blr->req->outbuf,
+                                 true, blr->req->seqnum+1,
+                                 IS_CONN_ENCRYPTED(blr->fsp->conn),
+                                 NULL)) {
+                       exit_server_cleanly("blocking_lock_reply_error: "
+                                           "srv_send_smb failed.");
                }
-               /*
-                * Still can't get the lock - keep waiting.
-                */
-               DEBUG(10,("process_lock: failed to get lock for file = %s. Still waiting....\n",
-                         fsp->fsp_name));
-               return False;
+               TALLOC_FREE(blr->req->outbuf);
+               break;
+       default:
+               DEBUG(0,("blocking_lock_reply_error: PANIC - unknown type on blocking lock queue - exiting.!\n"));
+               exit_server("PANIC - unknown type on blocking lock queue");
        }
-
-       /*
-        * Success - we got the lock.
-        */
-       
-       DEBUG(3,("process_lock : file=%s fnum=%d offset=%.0f count=%.0f\n",
-                fsp->fsp_name, fsp->fnum, (double)offset, (double)count));
-       
-       construct_reply_common(inbuf, outbuf);
-       outsize = set_message(outbuf,0,0,True);
-       send_blocking_reply(outbuf,outsize);
-       return True;
 }
 
 /****************************************************************************
@@ -419,63 +390,79 @@ static BOOL process_lock(blocking_lock_record *blr)
  Returns True if we want to be removed from the list.
 *****************************************************************************/
 
-static BOOL process_lockingX(blocking_lock_record *blr)
+static bool process_lockingX(struct blocking_lock_record *blr)
 {
-       char *inbuf = blr->inbuf;
-       unsigned char locktype = CVAL(inbuf,smb_vwv3);
+       unsigned char locktype = CVAL(blr->req->vwv+3, 0);
        files_struct *fsp = blr->fsp;
-       connection_struct *conn = conn_find(SVAL(inbuf,smb_tid));
-       uint16 num_ulocks = SVAL(inbuf,smb_vwv6);
-       uint16 num_locks = SVAL(inbuf,smb_vwv7);
-       SMB_BIG_UINT count = (SMB_BIG_UINT)0, offset = (SMB_BIG_UINT)0;
-       uint16 lock_pid;
-       BOOL large_file_format = (locktype & LOCKING_ANDX_LARGE_FILES);
-       char *data;
-       BOOL my_lock_ctx = False;
+       uint16 num_ulocks = SVAL(blr->req->vwv+6, 0);
+       uint16 num_locks = SVAL(blr->req->vwv+7, 0);
+       uint64_t count = (uint64_t)0, offset = (uint64_t)0;
+       uint32 lock_pid;
+       bool large_file_format = (locktype & LOCKING_ANDX_LARGE_FILES);
+       uint8_t *data;
        NTSTATUS status = NT_STATUS_OK;
 
-       data = smb_buf(inbuf) + ((large_file_format ? 20 : 10)*num_ulocks);
+       data = (uint8_t *)blr->req->buf
+               + ((large_file_format ? 20 : 10)*num_ulocks);
 
        /* 
         * Data now points at the beginning of the list
         * of smb_lkrng structs.
         */
-       
+
        for(; blr->lock_num < num_locks; blr->lock_num++) {
-               BOOL err;
+               struct byte_range_lock *br_lck = NULL;
+               bool err;
 
                lock_pid = get_lock_pid( data, blr->lock_num, large_file_format);
                count = get_lock_count( data, blr->lock_num, large_file_format);
                offset = get_lock_offset( data, blr->lock_num, large_file_format, &err);
-               
+
                /*
                 * We know err cannot be set as if it was the lock
                 * request would never have been queued. JRA.
                 */
                errno = 0;
-               status = do_lock_spin(fsp,conn,lock_pid,count,offset, 
-                                ((locktype & 1) ? READ_LOCK : WRITE_LOCK), &my_lock_ctx);
-               if (NT_STATUS_IS_ERR(status)) break;
+               br_lck = do_lock(smbd_messaging_context(),
+                               fsp,
+                               lock_pid,
+                               count,
+                               offset, 
+                               ((locktype & LOCKING_ANDX_SHARED_LOCK) ?
+                                       READ_LOCK : WRITE_LOCK),
+                               WINDOWS_LOCK,
+                               True,
+                               &status,
+                               &blr->blocking_pid,
+                               blr);
+
+               TALLOC_FREE(br_lck);
+
+               if (NT_STATUS_IS_ERR(status)) {
+                       break;
+               }
        }
 
        if(blr->lock_num == num_locks) {
                /*
                 * Success - we got all the locks.
                 */
-               
-               DEBUG(3,("process_lockingX file = %s, fnum=%d type=%d num_locks=%d\n",
-                        fsp->fsp_name, fsp->fnum, (unsigned int)locktype, num_locks) );
+
+               DEBUG(3,("process_lockingX file = %s, fnum=%d type=%d "
+                        "num_locks=%d\n", fsp_str_dbg(fsp), fsp->fnum,
+                        (unsigned int)locktype, num_locks));
 
                reply_lockingX_success(blr);
                return True;
-       } else if (!NT_STATUS_EQUAL(status,NT_STATUS_LOCK_NOT_GRANTED) &&
-                       !NT_STATUS_EQUAL(status,NT_STATUS_FILE_LOCK_CONFLICT)) {
-                       /*
-                        * We have other than a "can't get lock"
-                        * error. Free any locks we had and return an error.
-                        * Return True so we get dequeued.
-                        */
-               
+       }
+
+       if (!NT_STATUS_EQUAL(status,NT_STATUS_LOCK_NOT_GRANTED) &&
+           !NT_STATUS_EQUAL(status,NT_STATUS_FILE_LOCK_CONFLICT)) {
+               /*
+                * We have other than a "can't get lock"
+                * error. Free any locks we had and return an error.
+                * Return True so we get dequeued.
+                */
                blocking_lock_reply_error(blr, status);
                return True;
        }
@@ -483,28 +470,71 @@ static BOOL process_lockingX(blocking_lock_record *blr)
        /*
         * Still can't get all the locks - keep waiting.
         */
-       
+
        DEBUG(10,("process_lockingX: only got %d locks of %d needed for file %s, fnum = %d. \
 Waiting....\n", 
-                 blr->lock_num, num_locks, fsp->fsp_name, fsp->fnum));
-       
+                blr->lock_num, num_locks, fsp_str_dbg(fsp), fsp->fnum));
+
        return False;
 }
 
+/****************************************************************************
+ Attempt to get the posix lock request from a SMBtrans2 call.
+ Returns True if we want to be removed from the list.
+*****************************************************************************/
+
+static bool process_trans2(struct blocking_lock_record *blr)
+{
+       char params[2];
+       NTSTATUS status;
+       struct byte_range_lock *br_lck = do_lock(smbd_messaging_context(),
+                                               blr->fsp,
+                                               blr->lock_pid,
+                                               blr->count,
+                                               blr->offset,
+                                               blr->lock_type,
+                                               blr->lock_flav,
+                                               True,
+                                               &status,
+                                               &blr->blocking_pid,
+                                               blr);
+       TALLOC_FREE(br_lck);
+
+       if (!NT_STATUS_IS_OK(status)) {
+               if (ERROR_WAS_LOCK_DENIED(status)) {
+                       /* Still can't get the lock, just keep waiting. */
+                       return False;
+               }       
+               /*
+                * We have other than a "can't get lock"
+                * error. Send an error and return True so we get dequeued.
+                */
+               blocking_lock_reply_error(blr, status);
+               return True;
+       }
+
+       /* We finally got the lock, return success. */
+
+       SSVAL(params,0,0);
+       /* Fake up max_data_bytes here - we know it fits. */
+       send_trans2_replies(blr->fsp->conn, blr->req, params, 2, NULL, 0, 0xffff);
+       return True;
+}
+
+
 /****************************************************************************
  Process a blocking lock SMB.
  Returns True if we want to be removed from the list.
 *****************************************************************************/
 
-static BOOL blocking_lock_record_process(blocking_lock_record *blr)
+static bool blocking_lock_record_process(struct blocking_lock_record *blr)
 {
-       switch(blr->com_type) {
-               case SMBlock:
-                       return process_lock(blr);
-               case SMBlockread:
-                       return process_lockread(blr);
+       switch(blr->req->cmd) {
                case SMBlockingX:
                        return process_lockingX(blr);
+               case SMBtrans2:
+               case SMBtranss2:
+                       return process_trans2(blr);
                default:
                        DEBUG(0,("blocking_lock_record_process: PANIC - unknown type on blocking lock queue - exiting.!\n"));
                        exit_server("PANIC - unknown type on blocking lock queue");
@@ -513,26 +543,50 @@ static BOOL blocking_lock_record_process(blocking_lock_record *blr)
 }
 
 /****************************************************************************
Delete entries by fnum from the blocking lock pending queue.
Cancel entries by fnum from the blocking lock pending queue.
 *****************************************************************************/
 
-void remove_pending_lock_requests_by_fid(files_struct *fsp)
+void cancel_pending_lock_requests_by_fid(files_struct *fsp, struct byte_range_lock *br_lck)
 {
-       blocking_lock_record *blr, *next = NULL;
+       struct blocking_lock_record *blr, *blr_cancelled, *next = NULL;
 
        for(blr = blocking_lock_queue; blr; blr = next) {
-               next = blr->next;
-               if(blr->fsp->fnum == fsp->fnum) {
-
-                       DEBUG(10,("remove_pending_lock_requests_by_fid - removing request type %d for \
-file %s fnum = %d\n", blr->com_type, fsp->fsp_name, fsp->fnum ));
+               unsigned char locktype = 0;
 
-                       brl_unlock(blr->fsp->dev, blr->fsp->inode, blr->fsp->fnum,
-                               blr->lock_pid, sys_getpid(), blr->fsp->conn->cnum,
-                               blr->offset, blr->count, True, NULL, NULL);
+               next = blr->next;
+               if (blr->fsp->fnum != fsp->fnum) {
+                       continue;
+               }
 
-                       free_blocking_lock_record(blr);
+               if (blr->req->cmd == SMBlockingX) {
+                       locktype = CVAL(blr->req->vwv+3, 0);
                }
+
+               DEBUG(10, ("remove_pending_lock_requests_by_fid - removing "
+                          "request type %d for file %s fnum = %d\n",
+                          blr->req->cmd, fsp_str_dbg(fsp), fsp->fnum));
+
+               blr_cancelled = blocking_lock_cancel(fsp,
+                                    blr->lock_pid,
+                                    blr->offset,
+                                    blr->count,
+                                    blr->lock_flav,
+                                    locktype,
+                                    NT_STATUS_RANGE_NOT_LOCKED);
+
+               SMB_ASSERT(blr_cancelled == blr);
+
+               brl_lock_cancel(br_lck,
+                               blr->lock_pid,
+                               procid_self(),
+                               blr->offset,
+                               blr->count,
+                               blr->lock_flav,
+                               blr);
+
+               /* We're closing the file fsp here, so ensure
+                * we don't have a dangling pointer. */
+               blr->fsp = NULL;
        }
 }
 
@@ -542,161 +596,265 @@ file %s fnum = %d\n", blr->com_type, fsp->fsp_name, fsp->fnum ));
 
 void remove_pending_lock_requests_by_mid(int mid)
 {
-       blocking_lock_record *blr, *next = NULL;
+       struct blocking_lock_record *blr, *next = NULL;
 
        for(blr = blocking_lock_queue; blr; blr = next) {
+               files_struct *fsp;
+               struct byte_range_lock *br_lck;
+
                next = blr->next;
-               if(SVAL(blr->inbuf,smb_mid) == mid) {
-                       files_struct *fsp = blr->fsp;
 
-                       DEBUG(10,("remove_pending_lock_requests_by_mid - removing request type %d for \
-file %s fnum = %d\n", blr->com_type, fsp->fsp_name, fsp->fnum ));
+               if (blr->req->mid != mid) {
+                       continue;
+               }
 
-                       blocking_lock_reply_error(blr,NT_STATUS_FILE_LOCK_CONFLICT);
-                       brl_unlock(blr->fsp->dev, blr->fsp->inode, blr->fsp->fnum,
-                               blr->lock_pid, sys_getpid(), blr->fsp->conn->cnum,
-                               blr->offset, blr->count, True, NULL, NULL);
-                       free_blocking_lock_record(blr);
+               fsp = blr->fsp;
+               br_lck = brl_get_locks(talloc_tos(), fsp);
+
+               if (br_lck) {
+                       DEBUG(10, ("remove_pending_lock_requests_by_mid - "
+                                  "removing request type %d for file %s fnum "
+                                  "= %d\n", blr->req->cmd, fsp_str_dbg(fsp),
+                                  fsp->fnum ));
+
+                       brl_lock_cancel(br_lck,
+                                       blr->lock_pid,
+                                       procid_self(),
+                                       blr->offset,
+                                       blr->count,
+                                       blr->lock_flav,
+                                       blr);
+                       TALLOC_FREE(br_lck);
                }
+
+               blocking_lock_reply_error(blr,NT_STATUS_FILE_LOCK_CONFLICT);
+               DLIST_REMOVE(blocking_lock_queue, blr);
+               TALLOC_FREE(blr);
        }
 }
 
 /****************************************************************************
-  Set a flag as an unlock request affects one of our pending locks.
+ Is this mid a blocking lock request on the queue ?
 *****************************************************************************/
 
-static void received_unlock_msg(int msg_type, pid_t src, void *buf, size_t len)
+bool blocking_lock_was_deferred(int mid)
 {
-       DEBUG(10,("received_unlock_msg\n"));
-       process_blocking_lock_queue(time(NULL));
+       struct blocking_lock_record *blr, *next = NULL;
+
+       for(blr = blocking_lock_queue; blr; blr = next) {
+               next = blr->next;
+               if(blr->req->mid == mid) {
+                       return True;
+               }
+       }
+       return False;
 }
 
 /****************************************************************************
- Return the number of seconds to the next blocking locks timeout, or default_timeout
+  Set a flag as an unlock request affects one of our pending locks.
 *****************************************************************************/
 
-unsigned blocking_locks_timeout(unsigned default_timeout)
+static void received_unlock_msg(struct messaging_context *msg,
+                               void *private_data,
+                               uint32_t msg_type,
+                               struct server_id server_id,
+                               DATA_BLOB *data)
 {
-       unsigned timeout = default_timeout;
-       time_t t;
-       blocking_lock_record *blr = blocking_lock_queue;
-
-       /* note that we avoid the time() syscall if there are no blocking locks */
-       if (!blr)
-               return timeout;
-
-       t = time(NULL);
-
-       for (; blr; blr = blr->next) {
-               if ((blr->expire_time != (time_t)-1) &&
-                                       (timeout > (blr->expire_time - t))) {
-                       timeout = blr->expire_time - t;
-               }
-       }
-
-       if (timeout < 1)
-               timeout = 1;
-
-       return timeout;
+       DEBUG(10,("received_unlock_msg\n"));
+       process_blocking_lock_queue();
 }
 
 /****************************************************************************
  Process the blocking lock queue. Note that this is only called as root.
 *****************************************************************************/
 
-void process_blocking_lock_queue(time_t t)
+void process_blocking_lock_queue(void)
 {
-       blocking_lock_record *blr, *next = NULL;
+       struct timeval tv_curr = timeval_current();
+       struct blocking_lock_record *blr, *next = NULL;
 
        /*
         * Go through the queue and see if we can get any of the locks.
         */
 
        for (blr = blocking_lock_queue; blr; blr = next) {
-               connection_struct *conn = NULL;
-               uint16 vuid;
-               files_struct *fsp = NULL;
 
                next = blr->next;
 
                /*
-                * Ensure we don't have any old chain_fsp values
-                * sitting around....
+                * Go through the remaining locks and try and obtain them.
+                * The call returns True if all locks were obtained successfully
+                * and False if we still need to wait.
+                */
+
+               DEBUG(10, ("Processing BLR = %p\n", blr));
+
+               /* We use set_current_service so connections with
+                * pending locks are not marked as idle.
+                */
+
+               set_current_service(blr->fsp->conn,
+                               SVAL(blr->req->inbuf,smb_flg),
+                               false);
+
+               if(blocking_lock_record_process(blr)) {
+                       struct byte_range_lock *br_lck = brl_get_locks(
+                               talloc_tos(), blr->fsp);
+
+                       DEBUG(10, ("BLR_process returned true: cancelling and "
+                           "removing lock. BLR = %p\n", blr));
+
+                       if (br_lck) {
+                               brl_lock_cancel(br_lck,
+                                       blr->lock_pid,
+                                       procid_self(),
+                                       blr->offset,
+                                       blr->count,
+                                       blr->lock_flav,
+                                       blr);
+                               TALLOC_FREE(br_lck);
+                       }
+
+                       DLIST_REMOVE(blocking_lock_queue, blr);
+                       TALLOC_FREE(blr);
+                       continue;
+               }
+
+               /*
+                * We couldn't get the locks for this record on the list.
+                * If the time has expired, return a lock error.
                 */
-               chain_size = 0;
-               file_chain_reset();
-               fsp = blr->fsp;
 
-               conn = conn_find(SVAL(blr->inbuf,smb_tid));
-               vuid = (lp_security() == SEC_SHARE) ? UID_FIELD_INVALID :
-                               SVAL(blr->inbuf,smb_uid);
+               if (!timeval_is_zero(&blr->expire_time) && timeval_compare(&blr->expire_time, &tv_curr) <= 0) {
+                       struct byte_range_lock *br_lck = brl_get_locks(
+                               talloc_tos(), blr->fsp);
 
-               DEBUG(5,("process_blocking_lock_queue: examining pending lock fnum = %d for file %s\n",
-                       fsp->fnum, fsp->fsp_name ));
+                       DEBUG(10, ("Lock timed out! BLR = %p\n", blr));
 
-               if((blr->expire_time != -1) && (blr->expire_time <= t)) {
                        /*
                         * Lock expired - throw away all previously
                         * obtained locks and return lock error.
                         */
-                       DEBUG(5,("process_blocking_lock_queue: pending lock fnum = %d for file %s timed out.\n",
-                               fsp->fnum, fsp->fsp_name ));
 
-                       brl_unlock(fsp->dev, fsp->inode, fsp->fnum,
-                               blr->lock_pid, sys_getpid(), conn->cnum,
-                               blr->offset, blr->count, True, NULL, NULL);
+                       if (br_lck) {
+                               DEBUG(5,("process_blocking_lock_queue: "
+                                        "pending lock fnum = %d for file %s "
+                                        "timed out.\n", blr->fsp->fnum,
+                                        fsp_str_dbg(blr->fsp)));
+
+                               brl_lock_cancel(br_lck,
+                                       blr->lock_pid,
+                                       procid_self(),
+                                       blr->offset,
+                                       blr->count,
+                                       blr->lock_flav,
+                                       blr);
+                               TALLOC_FREE(br_lck);
+                       }
 
                        blocking_lock_reply_error(blr,NT_STATUS_FILE_LOCK_CONFLICT);
-                       free_blocking_lock_record(blr);
-                       continue;
+                       DLIST_REMOVE(blocking_lock_queue, blr);
+                       TALLOC_FREE(blr);
                }
+       }
 
-               if(!change_to_user(conn,vuid)) {
-                       DEBUG(0,("process_blocking_lock_queue: Unable to become user vuid=%d.\n",
-                               vuid ));
-                       /*
-                        * Remove the entry and return an error to the client.
-                        */
-                       blocking_lock_reply_error(blr,NT_STATUS_ACCESS_DENIED);
+       recalc_brl_timeout();
+}
 
-                       brl_unlock(fsp->dev, fsp->inode, fsp->fnum,
-                                       blr->lock_pid, sys_getpid(), conn->cnum,
-                                       blr->offset, blr->count, True, NULL, NULL);
+/****************************************************************************
+ Handle a cancel message. Lock already moved onto the cancel queue.
+*****************************************************************************/
 
-                       free_blocking_lock_record(blr);
-                       continue;
-               }
+#define MSG_BLOCKING_LOCK_CANCEL_SIZE (sizeof(struct blocking_lock_record *) + sizeof(NTSTATUS))
 
-               if(!set_current_service(conn,SVAL(blr->inbuf,smb_flg),True)) {
-                       DEBUG(0,("process_blocking_lock_queue: Unable to become service Error was %s.\n", strerror(errno) ));
-                       /*
-                        * Remove the entry and return an error to the client.
-                        */
-                       blocking_lock_reply_error(blr,NT_STATUS_ACCESS_DENIED);
+static void process_blocking_lock_cancel_message(struct messaging_context *ctx,
+                                                void *private_data,
+                                                uint32_t msg_type,
+                                                struct server_id server_id,
+                                                DATA_BLOB *data)
+{
+       NTSTATUS err;
+       const char *msg = (const char *)data->data;
+       struct blocking_lock_record *blr;
 
-                       brl_unlock(fsp->dev, fsp->inode, fsp->fnum,
-                                       blr->lock_pid, sys_getpid(), conn->cnum,
-                                       blr->offset, blr->count, True, NULL, NULL);
+       if (data->data == NULL) {
+               smb_panic("process_blocking_lock_cancel_message: null msg");
+       }
 
-                       free_blocking_lock_record(blr);
-                       change_to_root_user();
-                       continue;
-               }
+       if (data->length != MSG_BLOCKING_LOCK_CANCEL_SIZE) {
+               DEBUG(0, ("process_blocking_lock_cancel_message: "
+                         "Got invalid msg len %d\n", (int)data->length));
+               smb_panic("process_blocking_lock_cancel_message: bad msg");
+        }
 
-               /*
-                * Go through the remaining locks and try and obtain them.
-                * The call returns True if all locks were obtained successfully
-                * and False if we still need to wait.
-                */
+       memcpy(&blr, msg, sizeof(blr));
+       memcpy(&err, &msg[sizeof(blr)], sizeof(NTSTATUS));
 
-               if(blocking_lock_record_process(blr)) {
+       DEBUG(10,("process_blocking_lock_cancel_message: returning error %s\n",
+               nt_errstr(err) ));
 
-                       brl_unlock(fsp->dev, fsp->inode, fsp->fnum,
-                                       blr->lock_pid, sys_getpid(), conn->cnum,
-                                       blr->offset, blr->count, True, NULL, NULL);
+       blocking_lock_reply_error(blr, err);
+       DLIST_REMOVE(blocking_lock_cancelled_queue, blr);
+       TALLOC_FREE(blr);
+}
+
+/****************************************************************************
+ Send ourselves a blocking lock cancelled message. Handled asynchronously above.
+ Returns the blocking_lock_record that is being cancelled.
+*****************************************************************************/
 
-                       free_blocking_lock_record(blr);
+struct blocking_lock_record *blocking_lock_cancel(files_struct *fsp,
+                       uint32 lock_pid,
+                       uint64_t offset,
+                       uint64_t count,
+                       enum brl_flavour lock_flav,
+                       unsigned char locktype,
+                        NTSTATUS err)
+{
+       char msg[MSG_BLOCKING_LOCK_CANCEL_SIZE];
+       struct blocking_lock_record *blr;
+
+       if (!blocking_lock_cancel_state) {
+               /* Register our message. */
+               messaging_register(smbd_messaging_context(), NULL,
+                                  MSG_SMB_BLOCKING_LOCK_CANCEL,
+                                  process_blocking_lock_cancel_message);
+
+               blocking_lock_cancel_state = True;
+       }
+
+       for (blr = blocking_lock_queue; blr; blr = blr->next) {
+               if (fsp == blr->fsp &&
+                               lock_pid == blr->lock_pid &&
+                               offset == blr->offset &&
+                               count == blr->count &&
+                               lock_flav == blr->lock_flav) {
+                       break;
                }
-               change_to_root_user();
        }
+
+       if (!blr) {
+               return NULL;
+       }
+
+       /* Check the flags are right. */
+       if (blr->req->cmd == SMBlockingX &&
+               (locktype & LOCKING_ANDX_LARGE_FILES) !=
+                       (CVAL(blr->req->vwv+3, 0) & LOCKING_ANDX_LARGE_FILES)) {
+               return NULL;
+       }
+
+       /* Move to cancelled queue. */
+       DLIST_REMOVE(blocking_lock_queue, blr);
+       DLIST_ADD(blocking_lock_cancelled_queue, blr);
+
+       /* Create the message. */
+       memcpy(msg, &blr, sizeof(blr));
+       memcpy(&msg[sizeof(blr)], &err, sizeof(NTSTATUS));
+
+       messaging_send_buf(smbd_messaging_context(), procid_self(),
+                          MSG_SMB_BLOCKING_LOCK_CANCEL,
+                          (uint8 *)&msg, sizeof(msg));
+
+       return blr;
 }