smbd: Don't store num_read_oplocks in brlock.tdb
[samba.git] / source3 / locking / brlock.c
index 1c4c4d0d293d37f7713de59adb7319dea404192e..cdfd09ceff11c07e6da020d84dd8d95d2f1fc596 100644 (file)
@@ -26,6 +26,7 @@
 
 #include "includes.h"
 #include "system/filesys.h"
+#include "lib/util/server_id.h"
 #include "locking/proto.h"
 #include "smbd/globals.h"
 #include "dbwrap/dbwrap.h"
@@ -47,7 +48,6 @@ struct byte_range_lock {
        struct files_struct *fsp;
        unsigned int num_locks;
        bool modified;
-       bool have_read_oplocks;
        struct lock_struct *lock_data;
        struct db_record *record;
 };
@@ -58,18 +58,20 @@ struct byte_range_lock {
 
 static void print_lock_struct(unsigned int i, const struct lock_struct *pls)
 {
-       DEBUG(10,("[%u]: smblctx = %llu, tid = %u, pid = %s, ",
-                       i,
-                       (unsigned long long)pls->context.smblctx,
-                       (unsigned int)pls->context.tid,
-                       server_id_str(talloc_tos(), &pls->context.pid) ));
-
-       DEBUG(10, ("start = %ju, size = %ju, fnum = %ju, %s %s\n",
-                  (uintmax_t)pls->start,
-                  (uintmax_t)pls->size,
-                  (uintmax_t)pls->fnum,
-                  lock_type_name(pls->lock_type),
-                  lock_flav_name(pls->lock_flav)));
+       struct server_id_buf tmp;
+
+       DBG_DEBUG("[%u]: smblctx = %"PRIu64", tid = %"PRIu32", pid = %s, "
+                 "start = %"PRIu64", size = %"PRIu64", fnum = %"PRIu64", "
+                 "%s %s\n",
+                 i,
+                 pls->context.smblctx,
+                 pls->context.tid,
+                 server_id_str_buf(pls->context.pid, &tmp),
+                 pls->start,
+                 pls->size,
+                 pls->fnum,
+                 lock_type_name(pls->lock_type),
+                 lock_flav_name(pls->lock_flav));
 }
 
 unsigned int brl_num_locks(const struct byte_range_lock *brl)
@@ -82,21 +84,6 @@ struct files_struct *brl_fsp(struct byte_range_lock *brl)
        return brl->fsp;
 }
 
-bool brl_have_read_oplocks(const struct byte_range_lock *brl)
-{
-       return brl->have_read_oplocks;
-}
-
-void brl_set_have_read_oplocks(struct byte_range_lock *brl,
-                              bool have_read_oplocks)
-{
-       DEBUG(10, ("Setting have_read_oplocks to %s\n",
-                  have_read_oplocks ? "true" : "false"));
-       SMB_ASSERT(brl->record != NULL); /* otherwise we're readonly */
-       brl->have_read_oplocks = have_read_oplocks;
-       brl->modified = true;
-}
-
 /****************************************************************************
  See if two locking contexts are equal.
 ****************************************************************************/
@@ -139,10 +126,6 @@ static bool brl_overlap(const struct lock_struct *lck1,
 static bool brl_conflict(const struct lock_struct *lck1,
                         const struct lock_struct *lck2)
 {
-       /* Ignore PENDING locks. */
-       if (IS_PENDING_LOCK(lck1->lock_type) || IS_PENDING_LOCK(lck2->lock_type))
-               return False;
-
        /* Read locks never conflict. */
        if (lck1->lock_type == READ_LOCK && lck2->lock_type == READ_LOCK) {
                return False;
@@ -173,10 +156,6 @@ static bool brl_conflict_posix(const struct lock_struct *lck1,
        SMB_ASSERT(lck2->lock_flav == POSIX_LOCK);
 #endif
 
-       /* Ignore PENDING locks. */
-       if (IS_PENDING_LOCK(lck1->lock_type) || IS_PENDING_LOCK(lck2->lock_type))
-               return False;
-
        /* Read locks never conflict. */
        if (lck1->lock_type == READ_LOCK && lck2->lock_type == READ_LOCK) {
                return False;
@@ -196,9 +175,6 @@ static bool brl_conflict_posix(const struct lock_struct *lck1,
 static bool brl_conflict1(const struct lock_struct *lck1,
                         const struct lock_struct *lck2)
 {
-       if (IS_PENDING_LOCK(lck1->lock_type) || IS_PENDING_LOCK(lck2->lock_type))
-               return False;
-
        if (lck1->lock_type == READ_LOCK && lck2->lock_type == READ_LOCK) {
                return False;
        }
@@ -230,11 +206,6 @@ static bool brl_conflict1(const struct lock_struct *lck1,
 static bool brl_conflict_other(const struct lock_struct *lock,
                               const struct lock_struct *rw_probe)
 {
-       if (IS_PENDING_LOCK(lock->lock_type) ||
-           IS_PENDING_LOCK(rw_probe->lock_type)) {
-               return False;
-       }
-
        if (lock->lock_type == READ_LOCK && rw_probe->lock_type == READ_LOCK) {
                return False;
        }
@@ -288,53 +259,6 @@ static bool brl_conflict_other(const struct lock_struct *lock,
        return false;
 }
 
-/****************************************************************************
- Check if an unlock overlaps a pending lock.
-****************************************************************************/
-
-static bool brl_pending_overlap(const struct lock_struct *lock, const struct lock_struct *pend_lock)
-{
-       if ((lock->start <= pend_lock->start) && (lock->start + lock->size > pend_lock->start))
-               return True;
-       if ((lock->start >= pend_lock->start) && (lock->start < pend_lock->start + pend_lock->size))
-               return True;
-       return False;
-}
-
-/****************************************************************************
- Amazingly enough, w2k3 "remembers" whether the last lock failure on a fnum
- is the same as this one and changes its error code. I wonder if any
- app depends on this ?
-****************************************************************************/
-
-static NTSTATUS brl_lock_failed(files_struct *fsp,
-                               const struct lock_struct *lock,
-                               bool blocking_lock)
-{
-       if (lock->start >= 0xEF000000 && (lock->start >> 63) == 0) {
-               /* amazing the little things you learn with a test
-                  suite. Locks beyond this offset (as a 64 bit
-                  number!) always generate the conflict error code,
-                  unless the top bit is set */
-               if (!blocking_lock) {
-                       fsp->last_lock_failure = *lock;
-               }
-               return NT_STATUS_FILE_LOCK_CONFLICT;
-       }
-
-       if (serverid_equal(&lock->context.pid, &fsp->last_lock_failure.context.pid) &&
-                       lock->context.tid == fsp->last_lock_failure.context.tid &&
-                       lock->fnum == fsp->last_lock_failure.fnum &&
-                       lock->start == fsp->last_lock_failure.start) {
-               return NT_STATUS_FILE_LOCK_CONFLICT;
-       }
-
-       if (!blocking_lock) {
-               fsp->last_lock_failure = *lock;
-       }
-       return NT_STATUS_LOCK_NOT_GRANTED;
-}
-
 /****************************************************************************
  Open up the brlock.tdb database.
 ****************************************************************************/
@@ -342,31 +266,36 @@ static NTSTATUS brl_lock_failed(files_struct *fsp,
 void brl_init(bool read_only)
 {
        int tdb_flags;
+       char *db_path;
 
        if (brlock_db) {
                return;
        }
 
-       tdb_flags = TDB_DEFAULT|TDB_VOLATILE|TDB_CLEAR_IF_FIRST|TDB_INCOMPATIBLE_HASH;
+       tdb_flags =
+               TDB_DEFAULT|
+               TDB_VOLATILE|
+               TDB_CLEAR_IF_FIRST|
+               TDB_INCOMPATIBLE_HASH|
+               TDB_SEQNUM;
 
-       if (!lp_clustering()) {
-               /*
-                * We can't use the SEQNUM trick to cache brlock
-                * entries in the clustering case because ctdb seqnum
-                * propagation has a delay.
-                */
-               tdb_flags |= TDB_SEQNUM;
+       db_path = lock_path(talloc_tos(), "brlock.tdb");
+       if (db_path == NULL) {
+               DEBUG(0, ("out of memory!\n"));
+               return;
        }
 
-       brlock_db = db_open(NULL, lock_path("brlock.tdb"),
+       brlock_db = db_open(NULL, db_path,
                            SMB_OPEN_DATABASE_TDB_HASH_SIZE, tdb_flags,
                            read_only?O_RDONLY:(O_RDWR|O_CREAT), 0644,
                            DBWRAP_LOCK_ORDER_2, DBWRAP_FLAG_NONE);
        if (!brlock_db) {
                DEBUG(0,("Failed to open byte range locking database %s\n",
-                       lock_path("brlock.tdb")));
+                        db_path));
+               TALLOC_FREE(db_path);
                return;
        }
+       TALLOC_FREE(db_path);
 }
 
 /****************************************************************************
@@ -401,7 +330,7 @@ static int lock_compare(const struct lock_struct *lck1,
 ****************************************************************************/
 
 NTSTATUS brl_lock_windows_default(struct byte_range_lock *br_lck,
-    struct lock_struct *plock, bool blocking_lock)
+                                 struct lock_struct *plock)
 {
        unsigned int i;
        files_struct *fsp = br_lck->fsp;
@@ -425,7 +354,7 @@ NTSTATUS brl_lock_windows_default(struct byte_range_lock *br_lck,
                        }
                        /* Remember who blocked us. */
                        plock->context.smblctx = locks[i].context.smblctx;
-                       return brl_lock_failed(fsp,plock,blocking_lock);
+                       return NT_STATUS_LOCK_NOT_GRANTED;
                }
 #if ZERO_ZERO
                if (plock->start == 0 && plock->size == 0 &&
@@ -435,15 +364,13 @@ NTSTATUS brl_lock_windows_default(struct byte_range_lock *br_lck,
 #endif
        }
 
-       if (!IS_PENDING_LOCK(plock->lock_type)) {
-               contend_level2_oplocks_begin(fsp, LEVEL2_CONTEND_WINDOWS_BRL);
-       }
+       contend_level2_oplocks_begin(fsp, LEVEL2_CONTEND_WINDOWS_BRL);
 
        /* We can get the Windows lock, now see if it needs to
           be mapped into a lower level POSIX one, and if so can
           we get it ? */
 
-       if (!IS_PENDING_LOCK(plock->lock_type) && lp_posix_locking(fsp->conn->params)) {
+       if (lp_posix_locking(fsp->conn->params)) {
                int errno_ret;
                if (!set_posix_lock_windows_flavour(fsp,
                                plock->start,
@@ -482,9 +409,7 @@ NTSTATUS brl_lock_windows_default(struct byte_range_lock *br_lck,
 
        return NT_STATUS_OK;
  fail:
-       if (!IS_PENDING_LOCK(plock->lock_type)) {
-               contend_level2_oplocks_end(fsp, LEVEL2_CONTEND_WINDOWS_BRL);
-       }
+       contend_level2_oplocks_end(fsp, LEVEL2_CONTEND_WINDOWS_BRL);
        return status;
 }
 
@@ -782,14 +707,12 @@ OR
  We must cope with range splits and merges.
 ****************************************************************************/
 
-static NTSTATUS brl_lock_posix(struct messaging_context *msg_ctx,
-                              struct byte_range_lock *br_lck,
+static NTSTATUS brl_lock_posix(struct byte_range_lock *br_lck,
                               struct lock_struct *plock)
 {
        unsigned int i, count, posix_count;
        struct lock_struct *locks = br_lck->lock_data;
        struct lock_struct *tp;
-       bool signal_pending_read = False;
        bool break_oplocks = false;
        NTSTATUS status;
 
@@ -817,13 +740,6 @@ static NTSTATUS brl_lock_posix(struct messaging_context *msg_ctx,
        for (i=0; i < br_lck->num_locks; i++) {
                struct lock_struct *curr_lock = &locks[i];
 
-               /* If we have a pending read lock, a lock downgrade should
-                  trigger a lock re-evaluation. */
-               if (curr_lock->lock_type == PENDING_READ_LOCK &&
-                               brl_pending_overlap(plock, curr_lock)) {
-                       signal_pending_read = True;
-               }
-
                if (curr_lock->lock_flav == WINDOWS_LOCK) {
                        /* Do any Windows flavour locks conflict ? */
                        if (brl_conflict(curr_lock, plock)) {
@@ -874,8 +790,7 @@ static NTSTATUS brl_lock_posix(struct messaging_context *msg_ctx,
         * call contend_level2_oplocks_begin if this is the first POSIX brl on
         * the file.
         */
-       break_oplocks = (!IS_PENDING_LOCK(plock->lock_type) &&
-                        posix_count == 0);
+       break_oplocks = (posix_count == 0);
        if (break_oplocks) {
                contend_level2_oplocks_begin(br_lck->fsp,
                                             LEVEL2_CONTEND_POSIX_BRL);
@@ -901,7 +816,7 @@ static NTSTATUS brl_lock_posix(struct messaging_context *msg_ctx,
           be mapped into a lower level POSIX one, and if so can
           we get it ? */
 
-       if (!IS_PENDING_LOCK(plock->lock_type) && lp_posix_locking(br_lck->fsp->conn->params)) {
+       if (lp_posix_locking(br_lck->fsp->conn->params)) {
                int errno_ret;
 
                /* The lower layer just needs to attempt to
@@ -912,6 +827,7 @@ static NTSTATUS brl_lock_posix(struct messaging_context *msg_ctx,
                                plock->start,
                                plock->size,
                                plock->lock_type,
+                               &plock->context,
                                &errno_ret)) {
 
                        /* We don't know who blocked us. */
@@ -948,27 +864,6 @@ static NTSTATUS brl_lock_posix(struct messaging_context *msg_ctx,
        /* A successful downgrade from write to read lock can trigger a lock
           re-evalutation where waiting readers can now proceed. */
 
-       if (signal_pending_read) {
-               /* Send unlock messages to any pending read waiters that overlap. */
-               for (i=0; i < br_lck->num_locks; i++) {
-                       struct lock_struct *pend_lock = &locks[i];
-
-                       /* Ignore non-pending locks. */
-                       if (!IS_PENDING_LOCK(pend_lock->lock_type)) {
-                               continue;
-                       }
-
-                       if (pend_lock->lock_type == PENDING_READ_LOCK &&
-                                       brl_pending_overlap(plock, pend_lock)) {
-                               DEBUG(10,("brl_lock_posix: sending unlock message to pid %s\n",
-                                       procid_str_static(&pend_lock->context.pid )));
-
-                               messaging_send(msg_ctx, pend_lock->context.pid,
-                                              MSG_SMB_UNLOCK, &data_blob_null);
-                       }
-               }
-       }
-
        return NT_STATUS_OK;
  fail:
        if (break_oplocks) {
@@ -980,32 +875,32 @@ static NTSTATUS brl_lock_posix(struct messaging_context *msg_ctx,
 
 NTSTATUS smb_vfs_call_brl_lock_windows(struct vfs_handle_struct *handle,
                                       struct byte_range_lock *br_lck,
-                                      struct lock_struct *plock,
-                                      bool blocking_lock)
+                                      struct lock_struct *plock)
 {
        VFS_FIND(brl_lock_windows);
-       return handle->fns->brl_lock_windows_fn(handle, br_lck, plock,
-                                               blocking_lock);
+       return handle->fns->brl_lock_windows_fn(handle, br_lck, plock);
 }
 
 /****************************************************************************
  Lock a range of bytes.
 ****************************************************************************/
 
-NTSTATUS brl_lock(struct messaging_context *msg_ctx,
-               struct byte_range_lock *br_lck,
-               uint64_t smblctx,
-               struct server_id pid,
-               br_off start,
-               br_off size,
-               enum brl_type lock_type,
-               enum brl_flavour lock_flav,
-               bool blocking_lock,
-               uint64_t *psmblctx)
+NTSTATUS brl_lock(
+       struct byte_range_lock *br_lck,
+       uint64_t smblctx,
+       struct server_id pid,
+       br_off start,
+       br_off size,
+       enum brl_type lock_type,
+       enum brl_flavour lock_flav,
+       struct server_id *blocker_pid,
+       uint64_t *psmblctx)
 {
        NTSTATUS ret;
        struct lock_struct lock;
 
+       ZERO_STRUCT(lock);
+
 #if !ZERO_ZERO
        if (start == 0 && size == 0) {
                DEBUG(0,("client sent 0/0 lock - please report this\n"));
@@ -1024,19 +919,19 @@ NTSTATUS brl_lock(struct messaging_context *msg_ctx,
        };
 
        if (lock_flav == WINDOWS_LOCK) {
-               ret = SMB_VFS_BRL_LOCK_WINDOWS(br_lck->fsp->conn, br_lck,
-                                              &lock, blocking_lock);
+               ret = SMB_VFS_BRL_LOCK_WINDOWS(
+                       br_lck->fsp->conn, br_lck, &lock);
        } else {
-               ret = brl_lock_posix(msg_ctx, br_lck, &lock);
+               ret = brl_lock_posix(br_lck, &lock);
        }
 
 #if ZERO_ZERO
        /* sort the lock list */
        TYPESAFE_QSORT(br_lck->lock_data, (size_t)br_lck->num_locks, lock_compare);
 #endif
-
        /* If we're returning an error, return who blocked us. */
        if (!NT_STATUS_IS_OK(ret) && psmblctx) {
+               *blocker_pid = lock.context.pid;
                *psmblctx = lock.context.smblctx;
        }
        return ret;
@@ -1057,11 +952,10 @@ static void brl_delete_lock_struct(struct lock_struct *locks,
  Unlock a range of bytes - Windows semantics.
 ****************************************************************************/
 
-bool brl_unlock_windows_default(struct messaging_context *msg_ctx,
-                              struct byte_range_lock *br_lck,
-                              const struct lock_struct *plock)
+bool brl_unlock_windows_default(struct byte_range_lock *br_lck,
+                               const struct lock_struct *plock)
 {
-       unsigned int i, j;
+       unsigned int i;
        struct lock_struct *locks = br_lck->lock_data;
        enum brl_type deleted_lock_type = READ_LOCK; /* shut the compiler up.... */
 
@@ -1096,10 +990,6 @@ bool brl_unlock_windows_default(struct messaging_context *msg_ctx,
        for (i = 0; i < br_lck->num_locks; i++) {
                struct lock_struct *lock = &locks[i];
 
-               if (IS_PENDING_LOCK(lock->lock_type)) {
-                       continue;
-               }
-
                /* Only remove our own locks that match in start, size, and flavour. */
                if (brl_same_context(&lock->context, &plock->context) &&
                                        lock->fnum == plock->fnum &&
@@ -1135,25 +1025,6 @@ bool brl_unlock_windows_default(struct messaging_context *msg_ctx,
                                br_lck->num_locks);
        }
 
-       /* Send unlock messages to any pending waiters that overlap. */
-       for (j=0; j < br_lck->num_locks; j++) {
-               struct lock_struct *pend_lock = &locks[j];
-
-               /* Ignore non-pending locks. */
-               if (!IS_PENDING_LOCK(pend_lock->lock_type)) {
-                       continue;
-               }
-
-               /* We could send specific lock info here... */
-               if (brl_pending_overlap(plock, pend_lock)) {
-                       DEBUG(10,("brl_unlock: sending unlock message to pid %s\n",
-                               procid_str_static(&pend_lock->context.pid )));
-
-                       messaging_send(msg_ctx, pend_lock->context.pid,
-                                      MSG_SMB_UNLOCK, &data_blob_null);
-               }
-       }
-
        contend_level2_oplocks_end(br_lck->fsp, LEVEL2_CONTEND_WINDOWS_BRL);
        return True;
 }
@@ -1162,11 +1033,10 @@ bool brl_unlock_windows_default(struct messaging_context *msg_ctx,
  Unlock a range of bytes - POSIX semantics.
 ****************************************************************************/
 
-static bool brl_unlock_posix(struct messaging_context *msg_ctx,
-                            struct byte_range_lock *br_lck,
+static bool brl_unlock_posix(struct byte_range_lock *br_lck,
                             struct lock_struct *plock)
 {
-       unsigned int i, j, count;
+       unsigned int i, count;
        struct lock_struct *tp;
        struct lock_struct *locks = br_lck->lock_data;
        bool overlap_found = False;
@@ -1199,8 +1069,7 @@ static bool brl_unlock_posix(struct messaging_context *msg_ctx,
                unsigned int tmp_count;
 
                /* Only remove our own locks - ignore fnum. */
-               if (IS_PENDING_LOCK(lock->lock_type) ||
-                               !brl_same_context(&lock->context, &plock->context)) {
+               if (!brl_same_context(&lock->context, &plock->context)) {
                        memcpy(&tp[count], lock, sizeof(struct lock_struct));
                        count++;
                        continue;
@@ -1291,45 +1160,22 @@ static bool brl_unlock_posix(struct messaging_context *msg_ctx,
        br_lck->lock_data = tp;
        br_lck->modified = True;
 
-       /* Send unlock messages to any pending waiters that overlap. */
-
-       for (j=0; j < br_lck->num_locks; j++) {
-               struct lock_struct *pend_lock = &locks[j];
-
-               /* Ignore non-pending locks. */
-               if (!IS_PENDING_LOCK(pend_lock->lock_type)) {
-                       continue;
-               }
-
-               /* We could send specific lock info here... */
-               if (brl_pending_overlap(plock, pend_lock)) {
-                       DEBUG(10,("brl_unlock: sending unlock message to pid %s\n",
-                               procid_str_static(&pend_lock->context.pid )));
-
-                       messaging_send(msg_ctx, pend_lock->context.pid,
-                                      MSG_SMB_UNLOCK, &data_blob_null);
-               }
-       }
-
        return True;
 }
 
 bool smb_vfs_call_brl_unlock_windows(struct vfs_handle_struct *handle,
-                                    struct messaging_context *msg_ctx,
                                     struct byte_range_lock *br_lck,
                                     const struct lock_struct *plock)
 {
        VFS_FIND(brl_unlock_windows);
-       return handle->fns->brl_unlock_windows_fn(handle, msg_ctx, br_lck,
-                                                 plock);
+       return handle->fns->brl_unlock_windows_fn(handle, br_lck, plock);
 }
 
 /****************************************************************************
  Unlock a range of bytes.
 ****************************************************************************/
 
-bool brl_unlock(struct messaging_context *msg_ctx,
-               struct byte_range_lock *br_lck,
+bool brl_unlock(struct byte_range_lock *br_lck,
                uint64_t smblctx,
                struct server_id pid,
                br_off start,
@@ -1348,10 +1194,10 @@ bool brl_unlock(struct messaging_context *msg_ctx,
        lock.lock_flav = lock_flav;
 
        if (lock_flav == WINDOWS_LOCK) {
-               return SMB_VFS_BRL_UNLOCK_WINDOWS(br_lck->fsp->conn, msg_ctx,
-                   br_lck, &lock);
+               return SMB_VFS_BRL_UNLOCK_WINDOWS(
+                       br_lck->fsp->conn, br_lck, &lock);
        } else {
-               return brl_unlock_posix(msg_ctx, br_lck, &lock);
+               return brl_unlock_posix(br_lck, &lock);
        }
 }
 
@@ -1490,87 +1336,13 @@ NTSTATUS brl_lockquery(struct byte_range_lock *br_lck,
 }
 
 
-bool smb_vfs_call_brl_cancel_windows(struct vfs_handle_struct *handle,
-                                    struct byte_range_lock *br_lck,
-                                    struct lock_struct *plock)
-{
-       VFS_FIND(brl_cancel_windows);
-       return handle->fns->brl_cancel_windows_fn(handle, br_lck, plock);
-}
-
-/****************************************************************************
- Remove a particular pending lock.
-****************************************************************************/
-bool brl_lock_cancel(struct byte_range_lock *br_lck,
-               uint64_t smblctx,
-               struct server_id pid,
-               br_off start,
-               br_off size,
-               enum brl_flavour lock_flav)
-{
-       bool ret;
-       struct lock_struct lock;
-
-       lock.context.smblctx = smblctx;
-       lock.context.pid = pid;
-       lock.context.tid = br_lck->fsp->conn->cnum;
-       lock.start = start;
-       lock.size = size;
-       lock.fnum = br_lck->fsp->fnum;
-       lock.lock_flav = lock_flav;
-       /* lock.lock_type doesn't matter */
-
-       if (lock_flav == WINDOWS_LOCK) {
-               ret = SMB_VFS_BRL_CANCEL_WINDOWS(br_lck->fsp->conn, br_lck,
-                                                &lock);
-       } else {
-               ret = brl_lock_cancel_default(br_lck, &lock);
-       }
-
-       return ret;
-}
-
-bool brl_lock_cancel_default(struct byte_range_lock *br_lck,
-               struct lock_struct *plock)
-{
-       unsigned int i;
-       struct lock_struct *locks = br_lck->lock_data;
-
-       SMB_ASSERT(plock);
-
-       for (i = 0; i < br_lck->num_locks; i++) {
-               struct lock_struct *lock = &locks[i];
-
-               /* For pending locks we *always* care about the fnum. */
-               if (brl_same_context(&lock->context, &plock->context) &&
-                               lock->fnum == plock->fnum &&
-                               IS_PENDING_LOCK(lock->lock_type) &&
-                               lock->lock_flav == plock->lock_flav &&
-                               lock->start == plock->start &&
-                               lock->size == plock->size) {
-                       break;
-               }
-       }
-
-       if (i == br_lck->num_locks) {
-               /* Didn't find it. */
-               return False;
-       }
-
-       brl_delete_lock_struct(locks, br_lck->num_locks, i);
-       br_lck->num_locks -= 1;
-       br_lck->modified = True;
-       return True;
-}
-
 /****************************************************************************
  Remove any locks associated with a open file.
  We return True if this process owns any other Windows locks on this
  fd and so we should not immediately close the fd.
 ****************************************************************************/
 
-void brl_close_fnum(struct messaging_context *msg_ctx,
-                   struct byte_range_lock *br_lck)
+void brl_close_fnum(struct byte_range_lock *br_lck)
 {
        files_struct *fsp = br_lck->fsp;
        uint32_t tid = fsp->conn->cnum;
@@ -1598,7 +1370,7 @@ void brl_close_fnum(struct messaging_context *msg_ctx,
 
                if (lock->context.tid == tid && serverid_equal(&lock->context.pid, &pid) &&
                                (lock->fnum == fnum)) {
-                       brl_unlock(msg_ctx,
+                       brl_unlock(
                                br_lck,
                                lock->context.smblctx,
                                pid,
@@ -1841,7 +1613,6 @@ int brl_forall(void (*fn)(struct file_id id, struct server_id pid,
 
 static void byte_range_lock_flush(struct byte_range_lock *br_lck)
 {
-       size_t data_len;
        unsigned i;
        struct lock_struct *locks = br_lck->lock_data;
 
@@ -1865,15 +1636,7 @@ static void byte_range_lock_flush(struct byte_range_lock *br_lck)
                }
        }
 
-       data_len = br_lck->num_locks * sizeof(struct lock_struct);
-
-       if (br_lck->have_read_oplocks) {
-               data_len += 1;
-       }
-
-       DEBUG(10, ("data_len=%d\n", (int)data_len));
-
-       if (data_len == 0) {
+       if (br_lck->num_locks == 0) {
                /* No locks - delete this entry. */
                NTSTATUS status = dbwrap_record_delete(br_lck->record);
                if (!NT_STATUS_IS_OK(status)) {
@@ -1882,22 +1645,13 @@ static void byte_range_lock_flush(struct byte_range_lock *br_lck)
                        smb_panic("Could not delete byte range lock entry");
                }
        } else {
-               TDB_DATA data;
+               TDB_DATA data = {
+                       .dsize = br_lck->num_locks * sizeof(struct lock_struct),
+                       .dptr = (uint8_t *)br_lck->lock_data,
+               };
                NTSTATUS status;
 
-               data.dsize = data_len;
-               data.dptr = talloc_array(talloc_tos(), uint8_t, data_len);
-               SMB_ASSERT(data.dptr != NULL);
-
-               memcpy(data.dptr, br_lck->lock_data,
-                      br_lck->num_locks * sizeof(struct lock_struct));
-
-               if (br_lck->have_read_oplocks) {
-                       data.dptr[data_len-1] = 1;
-               }
-
                status = dbwrap_record_store(br_lck->record, data, TDB_REPLACE);
-               TALLOC_FREE(data.dptr);
                if (!NT_STATUS_IS_OK(status)) {
                        DEBUG(0, ("store returned %s\n", nt_errstr(status)));
                        smb_panic("Could not store byte range mode entry");
@@ -1917,6 +1671,29 @@ static int byte_range_lock_destructor(struct byte_range_lock *br_lck)
        return 0;
 }
 
+static bool brl_parse_data(struct byte_range_lock *br_lck, TDB_DATA data)
+{
+       size_t data_len;
+
+       if (data.dsize == 0) {
+               return true;
+       }
+       if (data.dsize % sizeof(struct lock_struct) != 0) {
+               DEBUG(1, ("Invalid data size: %u\n", (unsigned)data.dsize));
+               return false;
+       }
+
+       br_lck->num_locks = data.dsize / sizeof(struct lock_struct);
+       data_len = br_lck->num_locks * sizeof(struct lock_struct);
+
+       br_lck->lock_data = talloc_memdup(br_lck, data.dptr, data_len);
+       if (br_lck->lock_data == NULL) {
+               DEBUG(1, ("talloc_memdup failed\n"));
+               return false;
+       }
+       return true;
+}
+
 /*******************************************************************
  Fetch a set of byte range lock data from the database.
  Leave the record locked.
@@ -1926,18 +1703,16 @@ static int byte_range_lock_destructor(struct byte_range_lock *br_lck)
 struct byte_range_lock *brl_get_locks(TALLOC_CTX *mem_ctx, files_struct *fsp)
 {
        TDB_DATA key, data;
-       struct byte_range_lock *br_lck = talloc(mem_ctx, struct byte_range_lock);
+       struct byte_range_lock *br_lck;
 
+       br_lck = talloc_zero(mem_ctx, struct byte_range_lock);
        if (br_lck == NULL) {
                return NULL;
        }
 
        br_lck->fsp = fsp;
-       br_lck->num_locks = 0;
-       br_lck->have_read_oplocks = false;
-       br_lck->modified = False;
 
-       key.dptr = (uint8 *)&fsp->file_id;
+       key.dptr = (uint8_t *)&fsp->file_id;
        key.dsize = sizeof(struct file_id);
 
        br_lck->record = dbwrap_fetch_locked(brlock_db, br_lck, key);
@@ -1950,30 +1725,12 @@ struct byte_range_lock *brl_get_locks(TALLOC_CTX *mem_ctx, files_struct *fsp)
 
        data = dbwrap_record_get_value(br_lck->record);
 
-       br_lck->lock_data = NULL;
-
-       talloc_set_destructor(br_lck, byte_range_lock_destructor);
-
-       br_lck->num_locks = data.dsize / sizeof(struct lock_struct);
-
-       if (br_lck->num_locks != 0) {
-               br_lck->lock_data = talloc_array(
-                       br_lck, struct lock_struct, br_lck->num_locks);
-               if (br_lck->lock_data == NULL) {
-                       DEBUG(0, ("malloc failed\n"));
-                       TALLOC_FREE(br_lck);
-                       return NULL;
-               }
-
-               memcpy(br_lck->lock_data, data.dptr,
-                      talloc_get_size(br_lck->lock_data));
+       if (!brl_parse_data(br_lck, data)) {
+               TALLOC_FREE(br_lck);
+               return NULL;
        }
 
-       DEBUG(10, ("data.dsize=%d\n", (int)data.dsize));
-
-       if ((data.dsize % sizeof(struct lock_struct)) == 1) {
-               br_lck->have_read_oplocks = (data.dptr[data.dsize-1] == 1);
-       }
+       talloc_set_destructor(br_lck, byte_range_lock_destructor);
 
        if (DEBUGLEVEL >= 10) {
                unsigned int i;
@@ -1999,28 +1756,20 @@ static void brl_get_locks_readonly_parser(TDB_DATA key, TDB_DATA data,
 {
        struct brl_get_locks_readonly_state *state =
                (struct brl_get_locks_readonly_state *)private_data;
-       struct byte_range_lock *br_lock;
+       struct byte_range_lock *br_lck;
 
-       br_lock = talloc_pooled_object(
+       br_lck = talloc_pooled_object(
                state->mem_ctx, struct byte_range_lock, 1, data.dsize);
-       if (br_lock == NULL) {
+       if (br_lck == NULL) {
                *state->br_lock = NULL;
                return;
        }
-       br_lock->lock_data = (struct lock_struct *)talloc_memdup(
-               br_lock, data.dptr, data.dsize);
-       br_lock->num_locks = data.dsize / sizeof(struct lock_struct);
-
-       if ((data.dsize % sizeof(struct lock_struct)) == 1) {
-               br_lock->have_read_oplocks = (data.dptr[data.dsize-1] == 1);
-       } else {
-               br_lock->have_read_oplocks = false;
+       *br_lck = (struct byte_range_lock) { 0 };
+       if (!brl_parse_data(br_lck, data)) {
+               *state->br_lock = NULL;
+               return;
        }
-
-       DEBUG(10, ("Got %d bytes, have_read_oplocks: %s\n", (int)data.dsize,
-                  br_lock->have_read_oplocks ? "true" : "false"));
-
-       *state->br_lock = br_lock;
+       *state->br_lock = br_lck;
 }
 
 struct byte_range_lock *brl_get_locks_readonly(files_struct *fsp)
@@ -2063,7 +1812,6 @@ struct byte_range_lock *brl_get_locks_readonly(files_struct *fsp)
                        return NULL;
                }
 
-               br_lock->have_read_oplocks = false;
                br_lock->num_locks = 0;
                br_lock->lock_data = NULL;
 
@@ -2080,125 +1828,17 @@ struct byte_range_lock *brl_get_locks_readonly(files_struct *fsp)
        br_lock->modified = false;
        br_lock->record = NULL;
 
-       if (lp_clustering()) {
-               /*
-                * In the cluster case we can't cache the brlock struct
-                * because dbwrap_get_seqnum does not work reliably over
-                * ctdb. Thus we have to throw away the brlock struct soon.
-                */
-               talloc_steal(talloc_tos(), br_lock);
-       } else {
-               /*
-                * Cache the brlock struct, invalidated when the dbwrap_seqnum
-                * changes. See beginning of this routine.
-                */
-               TALLOC_FREE(fsp->brlock_rec);
-               fsp->brlock_rec = br_lock;
-               fsp->brlock_seqnum = dbwrap_get_seqnum(brlock_db);
-       }
+       /*
+        * Cache the brlock struct, invalidated when the dbwrap_seqnum
+        * changes. See beginning of this routine.
+        */
+       TALLOC_FREE(fsp->brlock_rec);
+       fsp->brlock_rec = br_lock;
+       fsp->brlock_seqnum = dbwrap_get_seqnum(brlock_db);
 
        return br_lock;
 }
 
-struct brl_revalidate_state {
-       ssize_t array_size;
-       uint32 num_pids;
-       struct server_id *pids;
-};
-
-/*
- * Collect PIDs of all processes with pending entries
- */
-
-static void brl_revalidate_collect(struct file_id id, struct server_id pid,
-                                  enum brl_type lock_type,
-                                  enum brl_flavour lock_flav,
-                                  br_off start, br_off size,
-                                  void *private_data)
-{
-       struct brl_revalidate_state *state =
-               (struct brl_revalidate_state *)private_data;
-
-       if (!IS_PENDING_LOCK(lock_type)) {
-               return;
-       }
-
-       add_to_large_array(state, sizeof(pid), (void *)&pid,
-                          &state->pids, &state->num_pids,
-                          &state->array_size);
-}
-
-/*
- * qsort callback to sort the processes
- */
-
-static int compare_procids(const void *p1, const void *p2)
-{
-       const struct server_id *i1 = (const struct server_id *)p1;
-       const struct server_id *i2 = (const struct server_id *)p2;
-
-       if (i1->pid < i2->pid) return -1;
-       if (i1->pid > i2->pid) return 1;
-       return 0;
-}
-
-/*
- * Send a MSG_SMB_UNLOCK message to all processes with pending byte range
- * locks so that they retry. Mainly used in the cluster code after a node has
- * died.
- *
- * Done in two steps to avoid double-sends: First we collect all entries in an
- * array, then qsort that array and only send to non-dupes.
- */
-
-void brl_revalidate(struct messaging_context *msg_ctx,
-                   void *private_data,
-                   uint32_t msg_type,
-                   struct server_id server_id,
-                   DATA_BLOB *data)
-{
-       struct brl_revalidate_state *state;
-       uint32 i;
-       struct server_id last_pid;
-
-       if (!(state = talloc_zero(NULL, struct brl_revalidate_state))) {
-               DEBUG(0, ("talloc failed\n"));
-               return;
-       }
-
-       brl_forall(brl_revalidate_collect, state);
-
-       if (state->array_size == -1) {
-               DEBUG(0, ("talloc failed\n"));
-               goto done;
-       }
-
-       if (state->num_pids == 0) {
-               goto done;
-       }
-
-       TYPESAFE_QSORT(state->pids, state->num_pids, compare_procids);
-
-       ZERO_STRUCT(last_pid);
-
-       for (i=0; i<state->num_pids; i++) {
-               if (serverid_equal(&last_pid, &state->pids[i])) {
-                       /*
-                        * We've seen that one already
-                        */
-                       continue;
-               }
-
-               messaging_send(msg_ctx, state->pids[i], MSG_SMB_UNLOCK,
-                              &data_blob_null);
-               last_pid = state->pids[i];
-       }
-
- done:
-       TALLOC_FREE(state);
-       return;
-}
-
 bool brl_cleanup_disconnected(struct file_id fid, uint64_t open_persistent_id)
 {
        bool ret = false;
@@ -2232,10 +1872,11 @@ bool brl_cleanup_disconnected(struct file_id fid, uint64_t open_persistent_id)
                struct lock_context *ctx = &lock[n].context;
 
                if (!server_id_is_disconnected(&ctx->pid)) {
+                       struct server_id_buf tmp;
                        DEBUG(5, ("brl_cleanup_disconnected: byte range lock "
                                  "%s used by server %s, do not cleanup\n",
                                  file_id_string(frame, &fid),
-                                 server_id_str(frame, &ctx->pid)));
+                                 server_id_str_buf(ctx->pid, &tmp)));
                        goto done;
                }