r23755: Fix Coverity id 384
[jra/samba/.git] / source3 / locking / brlock.c
index 872ed2bbeaf8c1c04d278eb380a79b38c28994b8..9b8dcfd15e706e2ba54b42105bfb0ced1a17cca1 100644 (file)
@@ -34,7 +34,7 @@
 
 /* The open brlock.tdb database. */
 
-static TDB_CONTEXT *tdb;
+static struct db_context *brlock_db;
 
 /****************************************************************************
  Debug info at level 10 for lock struct.
@@ -261,14 +261,16 @@ static NTSTATUS brl_lock_failed(files_struct *fsp, const struct lock_struct *loc
 
 void brl_init(int read_only)
 {
-       if (tdb) {
+       if (brlock_db) {
                return;
        }
-       tdb = tdb_open_log(lock_path("brlock.tdb"),
-                       lp_open_files_db_hash_size(),
-                       TDB_DEFAULT|(read_only?0x0:TDB_CLEAR_IF_FIRST),
-                       read_only?O_RDONLY:(O_RDWR|O_CREAT), 0644 );
-       if (!tdb) {
+       brlock_db = db_open(NULL, lock_path("brlock.tdb"),
+                           lp_open_files_db_hash_size(),
+                           TDB_DEFAULT
+                           |TDB_VOLATILE
+                           |(read_only?0x0:TDB_CLEAR_IF_FIRST),
+                           read_only?O_RDONLY:(O_RDWR|O_CREAT), 0644 );
+       if (!brlock_db) {
                DEBUG(0,("Failed to open byte range locking database %s\n",
                        lock_path("brlock.tdb")));
                return;
@@ -281,10 +283,10 @@ void brl_init(int read_only)
 
 void brl_shutdown(int read_only)
 {
-       if (!tdb) {
+       if (!brlock_db) {
                return;
        }
-       tdb_close(tdb);
+       TALLOC_FREE(brlock_db);
 }
 
 #if ZERO_ZERO
@@ -310,15 +312,17 @@ static int lock_compare(const struct lock_struct *lck1,
 ****************************************************************************/
 
 static NTSTATUS brl_lock_windows(struct byte_range_lock *br_lck,
-                       const struct lock_struct *plock, BOOL blocking_lock)
+                       struct lock_struct *plock, BOOL blocking_lock)
 {
        unsigned int i;
        files_struct *fsp = br_lck->fsp;
-       struct lock_struct *locks = (struct lock_struct *)br_lck->lock_data;
+       struct lock_struct *locks = br_lck->lock_data;
 
        for (i=0; i < br_lck->num_locks; i++) {
                /* Do any Windows or POSIX locks conflict ? */
                if (brl_conflict(&locks[i], plock)) {
+                       /* Remember who blocked us. */
+                       plock->context.smbpid = locks[i].context.smbpid;
                        return brl_lock_failed(fsp,plock,blocking_lock);
                }
 #if ZERO_ZERO
@@ -343,6 +347,10 @@ static NTSTATUS brl_lock_windows(struct byte_range_lock *br_lck,
                                locks,
                                br_lck->num_locks,
                                &errno_ret)) {
+
+                       /* We don't know who blocked us. */
+                       plock->context.smbpid = 0xFFFFFFFF;
+
                        if (errno_ret == EACCES || errno_ret == EAGAIN) {
                                return NT_STATUS_FILE_LOCK_CONFLICT;
                        } else {
@@ -359,7 +367,7 @@ static NTSTATUS brl_lock_windows(struct byte_range_lock *br_lck,
 
        memcpy(&locks[br_lck->num_locks], plock, sizeof(struct lock_struct));
        br_lck->num_locks += 1;
-       br_lck->lock_data = (void *)locks;
+       br_lck->lock_data = locks;
        br_lck->modified = True;
 
        return NT_STATUS_OK;
@@ -569,9 +577,9 @@ OR
        }
 
        /* Never get here. */
-       smb_panic("brlock_posix_split_merge\n");
+       smb_panic("brlock_posix_split_merge");
        /* Notreached. */
-       abort();
+
        /* Keep some compilers happy. */
        return 0;
 }
@@ -581,11 +589,12 @@ OR
  We must cope with range splits and merges.
 ****************************************************************************/
 
-static NTSTATUS brl_lock_posix(struct byte_range_lock *br_lck,
-                       const struct lock_struct *plock)
+static NTSTATUS brl_lock_posix(struct messaging_context *msg_ctx,
+                              struct byte_range_lock *br_lck,
+                              struct lock_struct *plock)
 {
        unsigned int i, count;
-       struct lock_struct *locks = (struct lock_struct *)br_lck->lock_data;
+       struct lock_struct *locks = br_lck->lock_data;
        struct lock_struct *tp;
        BOOL lock_was_added = False;
        BOOL signal_pending_read = False;
@@ -626,6 +635,8 @@ static NTSTATUS brl_lock_posix(struct byte_range_lock *br_lck,
                        if (brl_conflict(curr_lock, plock)) {
                                /* No games with error messages. */
                                SAFE_FREE(tp);
+                               /* Remember who blocked us. */
+                               plock->context.smbpid = curr_lock->context.smbpid;
                                return NT_STATUS_FILE_LOCK_CONFLICT;
                        }
                        /* Just copy the Windows lock into the new array. */
@@ -637,6 +648,8 @@ static NTSTATUS brl_lock_posix(struct byte_range_lock *br_lck,
                                /* Can't block ourselves with POSIX locks. */
                                /* No games with error messages. */
                                SAFE_FREE(tp);
+                               /* Remember who blocked us. */
+                               plock->context.smbpid = curr_lock->context.smbpid;
                                return NT_STATUS_FILE_LOCK_CONFLICT;
                        }
 
@@ -666,6 +679,10 @@ static NTSTATUS brl_lock_posix(struct byte_range_lock *br_lck,
                                plock->size,
                                plock->lock_type,
                                &errno_ret)) {
+
+                       /* We don't know who blocked us. */
+                       plock->context.smbpid = 0xFFFFFFFF;
+
                        if (errno_ret == EACCES || errno_ret == EAGAIN) {
                                SAFE_FREE(tp);
                                return NT_STATUS_FILE_LOCK_CONFLICT;
@@ -683,7 +700,7 @@ static NTSTATUS brl_lock_posix(struct byte_range_lock *br_lck,
        }
        br_lck->num_locks = count;
        SAFE_FREE(br_lck->lock_data);
-       br_lck->lock_data = (void *)tp;
+       br_lck->lock_data = tp;
        locks = tp;
        br_lck->modified = True;
 
@@ -705,9 +722,8 @@ static NTSTATUS brl_lock_posix(struct byte_range_lock *br_lck,
                                DEBUG(10,("brl_lock_posix: sending unlock message to pid %s\n",
                                        procid_str_static(&pend_lock->context.pid )));
 
-                               message_send_pid(pend_lock->context.pid,
-                                               MSG_SMB_UNLOCK,
-                                               NULL, 0, True);
+                               messaging_send(msg_ctx, pend_lock->context.pid,
+                                              MSG_SMB_UNLOCK, &data_blob_null);
                        }
                }
        }
@@ -719,14 +735,16 @@ static NTSTATUS brl_lock_posix(struct byte_range_lock *br_lck,
  Lock a range of bytes.
 ****************************************************************************/
 
-NTSTATUS brl_lock(struct byte_range_lock *br_lck,
+NTSTATUS brl_lock(struct messaging_context *msg_ctx,
+               struct byte_range_lock *br_lck,
                uint32 smbpid,
-               struct process_id pid,
+               struct server_id pid,
                br_off start,
                br_off size, 
                enum brl_type lock_type,
                enum brl_flavour lock_flav,
-               BOOL blocking_lock)
+               BOOL blocking_lock,
+               uint32 *psmbpid)
 {
        NTSTATUS ret;
        struct lock_struct lock;
@@ -749,7 +767,7 @@ NTSTATUS brl_lock(struct byte_range_lock *br_lck,
        if (lock_flav == WINDOWS_LOCK) {
                ret = brl_lock_windows(br_lck, &lock, blocking_lock);
        } else {
-               ret = brl_lock_posix(br_lck, &lock);
+               ret = brl_lock_posix(msg_ctx, br_lck, &lock);
        }
 
 #if ZERO_ZERO
@@ -757,6 +775,10 @@ NTSTATUS brl_lock(struct byte_range_lock *br_lck,
        qsort(br_lck->lock_data, (size_t)br_lck->num_locks, sizeof(lock), lock_compare);
 #endif
 
+       /* If we're returning an error, return who blocked us. */
+       if (!NT_STATUS_IS_OK(ret) && psmbpid) {
+               *psmbpid = lock.context.smbpid;
+       }
        return ret;
 }
 
@@ -764,10 +786,12 @@ NTSTATUS brl_lock(struct byte_range_lock *br_lck,
  Unlock a range of bytes - Windows semantics.
 ****************************************************************************/
 
-static BOOL brl_unlock_windows(struct byte_range_lock *br_lck, const struct lock_struct *plock)
+static BOOL brl_unlock_windows(struct messaging_context *msg_ctx,
+                              struct byte_range_lock *br_lck,
+                              const struct lock_struct *plock)
 {
        unsigned int i, j;
-       struct lock_struct *locks = (struct lock_struct *)br_lck->lock_data;
+       struct lock_struct *locks = br_lck->lock_data;
        enum brl_type deleted_lock_type = READ_LOCK; /* shut the compiler up.... */
 
 #if ZERO_ZERO
@@ -853,9 +877,8 @@ static BOOL brl_unlock_windows(struct byte_range_lock *br_lck, const struct lock
                        DEBUG(10,("brl_unlock: sending unlock message to pid %s\n",
                                procid_str_static(&pend_lock->context.pid )));
 
-                       message_send_pid(pend_lock->context.pid,
-                                       MSG_SMB_UNLOCK,
-                                       NULL, 0, True);
+                       messaging_send(msg_ctx, pend_lock->context.pid,
+                                      MSG_SMB_UNLOCK, &data_blob_null);
                }
        }
 
@@ -866,11 +889,13 @@ static BOOL brl_unlock_windows(struct byte_range_lock *br_lck, const struct lock
  Unlock a range of bytes - POSIX semantics.
 ****************************************************************************/
 
-static BOOL brl_unlock_posix(struct byte_range_lock *br_lck, const struct lock_struct *plock)
+static BOOL brl_unlock_posix(struct messaging_context *msg_ctx,
+                            struct byte_range_lock *br_lck,
+                            const struct lock_struct *plock)
 {
        unsigned int i, j, count;
        struct lock_struct *tp;
-       struct lock_struct *locks = (struct lock_struct *)br_lck->lock_data;
+       struct lock_struct *locks = br_lck->lock_data;
        BOOL overlap_found = False;
 
        /* No zero-zero locks for POSIX. */
@@ -1003,7 +1028,7 @@ static BOOL brl_unlock_posix(struct byte_range_lock *br_lck, const struct lock_s
        br_lck->num_locks = count;
        SAFE_FREE(br_lck->lock_data);
        locks = tp;
-       br_lck->lock_data = (void *)tp;
+       br_lck->lock_data = tp;
        br_lck->modified = True;
 
        /* Send unlock messages to any pending waiters that overlap. */
@@ -1021,9 +1046,8 @@ static BOOL brl_unlock_posix(struct byte_range_lock *br_lck, const struct lock_s
                        DEBUG(10,("brl_unlock: sending unlock message to pid %s\n",
                                procid_str_static(&pend_lock->context.pid )));
 
-                       message_send_pid(pend_lock->context.pid,
-                                       MSG_SMB_UNLOCK,
-                                       NULL, 0, True);
+                       messaging_send(msg_ctx, pend_lock->context.pid,
+                                      MSG_SMB_UNLOCK, &data_blob_null);
                }
        }
 
@@ -1034,9 +1058,10 @@ static BOOL brl_unlock_posix(struct byte_range_lock *br_lck, const struct lock_s
  Unlock a range of bytes.
 ****************************************************************************/
 
-BOOL brl_unlock(struct byte_range_lock *br_lck,
+BOOL brl_unlock(struct messaging_context *msg_ctx,
+               struct byte_range_lock *br_lck,
                uint32 smbpid,
-               struct process_id pid,
+               struct server_id pid,
                br_off start,
                br_off size,
                enum brl_flavour lock_flav)
@@ -1053,9 +1078,9 @@ BOOL brl_unlock(struct byte_range_lock *br_lck,
        lock.lock_flav = lock_flav;
 
        if (lock_flav == WINDOWS_LOCK) {
-               return brl_unlock_windows(br_lck, &lock);
+               return brl_unlock_windows(msg_ctx, br_lck, &lock);
        } else {
-               return brl_unlock_posix(br_lck, &lock);
+               return brl_unlock_posix(msg_ctx, br_lck, &lock);
        }
 }
 
@@ -1066,7 +1091,7 @@ BOOL brl_unlock(struct byte_range_lock *br_lck,
 
 BOOL brl_locktest(struct byte_range_lock *br_lck,
                uint32 smbpid,
-               struct process_id pid,
+               struct server_id pid,
                br_off start,
                br_off size, 
                enum brl_type lock_type,
@@ -1075,7 +1100,7 @@ BOOL brl_locktest(struct byte_range_lock *br_lck,
        BOOL ret = True;
        unsigned int i;
        struct lock_struct lock;
-       const struct lock_struct *locks = (struct lock_struct *)br_lck->lock_data;
+       const struct lock_struct *locks = br_lck->lock_data;
        files_struct *fsp = br_lck->fsp;
 
        lock.context.smbpid = smbpid;
@@ -1124,7 +1149,7 @@ BOOL brl_locktest(struct byte_range_lock *br_lck,
 
 NTSTATUS brl_lockquery(struct byte_range_lock *br_lck,
                uint32 *psmbpid,
-               struct process_id pid,
+               struct server_id pid,
                br_off *pstart,
                br_off *psize, 
                enum brl_type *plock_type,
@@ -1132,7 +1157,7 @@ NTSTATUS brl_lockquery(struct byte_range_lock *br_lck,
 {
        unsigned int i;
        struct lock_struct lock;
-       const struct lock_struct *locks = (struct lock_struct *)br_lck->lock_data;
+       const struct lock_struct *locks = br_lck->lock_data;
        files_struct *fsp = br_lck->fsp;
 
        lock.context.smbpid = *psmbpid;
@@ -1192,13 +1217,13 @@ NTSTATUS brl_lockquery(struct byte_range_lock *br_lck,
 
 BOOL brl_lock_cancel(struct byte_range_lock *br_lck,
                uint32 smbpid,
-               struct process_id pid,
+               struct server_id pid,
                br_off start,
                br_off size,
                enum brl_flavour lock_flav)
 {
        unsigned int i;
-       struct lock_struct *locks = (struct lock_struct *)br_lck->lock_data;
+       struct lock_struct *locks = br_lck->lock_data;
        struct lock_context context;
 
        context.smbpid = smbpid;
@@ -1241,15 +1266,16 @@ BOOL brl_lock_cancel(struct byte_range_lock *br_lck,
  fd and so we should not immediately close the fd.
 ****************************************************************************/
 
-void brl_close_fnum(struct byte_range_lock *br_lck)
+void brl_close_fnum(struct messaging_context *msg_ctx,
+                   struct byte_range_lock *br_lck)
 {
        files_struct *fsp = br_lck->fsp;
        uint16 tid = fsp->conn->cnum;
        int fnum = fsp->fnum;
        unsigned int i, j, dcount=0;
        int num_deleted_windows_locks = 0;
-       struct lock_struct *locks = (struct lock_struct *)br_lck->lock_data;
-       struct process_id pid = procid_self();
+       struct lock_struct *locks = br_lck->lock_data;
+       struct server_id pid = procid_self();
        BOOL unlock_individually = False;
 
        if(lp_posix_locking(fsp->conn->params)) {
@@ -1280,10 +1306,15 @@ void brl_close_fnum(struct byte_range_lock *br_lck)
                        unsigned int num_locks_copy;
 
                        /* Copy the current lock array. */
-                       locks_copy = (struct lock_struct *)TALLOC_MEMDUP(br_lck, locks, br_lck->num_locks * sizeof(struct lock_struct));
-                       if (!locks_copy) {
-                               smb_panic("brl_close_fnum: talloc fail.\n");
+                       if (br_lck->num_locks) {
+                               locks_copy = (struct lock_struct *)TALLOC_MEMDUP(br_lck, locks, br_lck->num_locks * sizeof(struct lock_struct));
+                               if (!locks_copy) {
+                                       smb_panic("brl_close_fnum: talloc failed");
+                               }
+                       } else {        
+                               locks_copy = NULL;
                        }
+
                        num_locks_copy = br_lck->num_locks;
 
                        for (i=0; i < num_locks_copy; i++) {
@@ -1291,7 +1322,8 @@ void brl_close_fnum(struct byte_range_lock *br_lck)
 
                                if (lock->context.tid == tid && procid_equal(&lock->context.pid, &pid) &&
                                                (lock->fnum == fnum)) {
-                                       brl_unlock(br_lck,
+                                       brl_unlock(msg_ctx,
+                                               br_lck,
                                                lock->context.smbpid,
                                                pid,
                                                lock->start,
@@ -1340,9 +1372,8 @@ void brl_close_fnum(struct byte_range_lock *br_lck)
 
                                /* We could send specific lock info here... */
                                if (brl_pending_overlap(lock, pend_lock)) {
-                                       message_send_pid(pend_lock->context.pid,
-                                                       MSG_SMB_UNLOCK,
-                                                       NULL, 0, True);
+                                       messaging_send(msg_ctx, pend_lock->context.pid,
+                                                      MSG_SMB_UNLOCK, &data_blob_null);
                                }
                        }
 
@@ -1416,31 +1447,40 @@ static BOOL validate_lock_entries(unsigned int *pnum_entries, struct lock_struct
        return True;
 }
 
+struct brl_forall_cb {
+       void (*fn)(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);
+       void *private_data;
+};
+
 /****************************************************************************
  Traverse the whole database with this function, calling traverse_callback
  on each lock.
 ****************************************************************************/
 
-static int traverse_fn(TDB_CONTEXT *ttdb, TDB_DATA kbuf, TDB_DATA dbuf, void *state)
+static int traverse_fn(struct db_record *rec, void *state)
 {
+       struct brl_forall_cb *cb = (struct brl_forall_cb *)state;
        struct lock_struct *locks;
-       struct lock_key *key;
+       struct file_id *key;
        unsigned int i;
        unsigned int num_locks = 0;
        unsigned int orig_num_locks = 0;
 
-       BRLOCK_FN(traverse_callback) = (BRLOCK_FN_CAST())state;
-
        /* In a traverse function we must make a copy of
           dbuf before modifying it. */
 
-       locks = (struct lock_struct *)memdup(dbuf.dptr, dbuf.dsize);
+       locks = (struct lock_struct *)memdup(rec->value.dptr,
+                                            rec->value.dsize);
        if (!locks) {
                return -1; /* Terminate traversal. */
        }
 
-       key = (struct lock_key *)kbuf.dptr;
-       orig_num_locks = num_locks = dbuf.dsize/sizeof(*locks);
+       key = (struct file_id *)rec->key.dptr;
+       orig_num_locks = num_locks = rec->value.dsize/sizeof(*locks);
 
        /* Ensure the lock db is clean of entries from invalid processes. */
 
@@ -1450,24 +1490,24 @@ static int traverse_fn(TDB_CONTEXT *ttdb, TDB_DATA kbuf, TDB_DATA dbuf, void *st
        }
 
        if (orig_num_locks != num_locks) {
-               dbuf.dptr = (char *)locks;
-               dbuf.dsize = num_locks * sizeof(*locks);
-
-               if (dbuf.dsize) {
-                       tdb_store(ttdb, kbuf, dbuf, TDB_REPLACE);
+               if (num_locks) {
+                       TDB_DATA data;
+                       data.dptr = (uint8_t *)locks;
+                       data.dsize = num_locks*sizeof(struct lock_struct);
+                       rec->store(rec, data, TDB_REPLACE);
                } else {
-                       tdb_delete(ttdb, kbuf);
+                       rec->delete_rec(rec);
                }
        }
 
        for ( i=0; i<num_locks; i++) {
-               traverse_callback(key->device,
-                                 key->inode,
-                                 locks[i].context.pid,
-                                 locks[i].lock_type,
-                                 locks[i].lock_flav,
-                                 locks[i].start,
-                                 locks[i].size);
+               cb->fn(*key,
+                      locks[i].context.pid,
+                      locks[i].lock_type,
+                      locks[i].lock_flav,
+                      locks[i].start,
+                      locks[i].size,
+                      cb->private_data);
        }
 
        SAFE_FREE(locks);
@@ -1478,12 +1518,21 @@ static int traverse_fn(TDB_CONTEXT *ttdb, TDB_DATA kbuf, TDB_DATA dbuf, void *st
  Call the specified function on each lock in the database.
 ********************************************************************/
 
-int brl_forall(BRLOCK_FN(fn))
+int brl_forall(void (*fn)(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),
+              void *private_data)
 {
-       if (!tdb) {
+       struct brl_forall_cb cb;
+
+       if (!brlock_db) {
                return 0;
        }
-       return tdb_traverse(tdb, traverse_fn, (void *)fn);
+       cb.fn = fn;
+       cb.private_data = private_data;
+       return brlock_db->traverse(brlock_db, traverse_fn, &cb);
 }
 
 /*******************************************************************
@@ -1496,8 +1545,8 @@ static int byte_range_lock_destructor(struct byte_range_lock *br_lck)
 {
        TDB_DATA key;
 
-       key.dptr = (char *)&br_lck->key;
-       key.dsize = sizeof(struct lock_key);
+       key.dptr = (uint8 *)&br_lck->key;
+       key.dsize = sizeof(struct file_id);
 
        if (br_lck->read_only) {
                SMB_ASSERT(!br_lck->modified);
@@ -1509,25 +1558,31 @@ static int byte_range_lock_destructor(struct byte_range_lock *br_lck)
 
        if (br_lck->num_locks == 0) {
                /* No locks - delete this entry. */
-               if (tdb_delete(tdb, key) == -1) {
-                       smb_panic("Could not delete byte range lock entry\n");
+               NTSTATUS status = br_lck->record->delete_rec(br_lck->record);
+               if (!NT_STATUS_IS_OK(status)) {
+                       DEBUG(0, ("delete_rec returned %s\n",
+                                 nt_errstr(status)));
+                       smb_panic("Could not delete byte range lock entry");
                }
        } else {
                TDB_DATA data;
-               data.dptr = (char *)br_lck->lock_data;
+               NTSTATUS status;
+
+               data.dptr = (uint8 *)br_lck->lock_data;
                data.dsize = br_lck->num_locks * sizeof(struct lock_struct);
 
-               if (tdb_store(tdb, key, data, TDB_REPLACE) == -1) {
-                       smb_panic("Could not store byte range mode entry\n");
+               status = br_lck->record->store(br_lck->record, data,
+                                              TDB_REPLACE);
+               if (!NT_STATUS_IS_OK(status)) {
+                       DEBUG(0, ("store returned %s\n", nt_errstr(status)));
+                       smb_panic("Could not store byte range mode entry");
                }
        }
 
  done:
 
-       if (!br_lck->read_only) {
-               tdb_chainunlock(tdb, key);
-       }
        SAFE_FREE(br_lck->lock_data);
+       TALLOC_FREE(br_lck->record);
        return 0;
 }
 
@@ -1540,8 +1595,7 @@ static int byte_range_lock_destructor(struct byte_range_lock *br_lck)
 static struct byte_range_lock *brl_get_locks_internal(TALLOC_CTX *mem_ctx,
                                        files_struct *fsp, BOOL read_only)
 {
-       TDB_DATA key;
-       TDB_DATA data;
+       TDB_DATA key, data;
        struct byte_range_lock *br_lck = TALLOC_P(mem_ctx, struct byte_range_lock);
 
        if (br_lck == NULL) {
@@ -1551,12 +1605,11 @@ static struct byte_range_lock *brl_get_locks_internal(TALLOC_CTX *mem_ctx,
        br_lck->fsp = fsp;
        br_lck->num_locks = 0;
        br_lck->modified = False;
-       memset(&br_lck->key, '\0', sizeof(struct lock_key));
-       br_lck->key.device = fsp->dev;
-       br_lck->key.inode = fsp->inode;
+       memset(&br_lck->key, '\0', sizeof(struct file_id));
+       br_lck->key = fsp->file_id;
 
-       key.dptr = (char *)&br_lck->key;
-       key.dsize = sizeof(struct lock_key);
+       key.dptr = (uint8 *)&br_lck->key;
+       key.dsize = sizeof(struct file_id);
 
        if (!fsp->lockdb_clean) {
                /* We must be read/write to clean
@@ -1565,43 +1618,57 @@ static struct byte_range_lock *brl_get_locks_internal(TALLOC_CTX *mem_ctx,
        }
 
        if (read_only) {
-               br_lck->read_only = True;
-       } else {
-               if (tdb_chainlock(tdb, key) != 0) {
+               if (brlock_db->fetch(brlock_db, br_lck, key, &data) == -1) {
+                       DEBUG(3, ("Could not fetch byte range lock record\n"));
+                       TALLOC_FREE(br_lck);
+                       return NULL;
+               }
+               br_lck->record = NULL;
+       }
+       else {
+               br_lck->record = brlock_db->fetch_locked(brlock_db, br_lck, key);
+
+               if (br_lck->record == NULL) {
                        DEBUG(3, ("Could not lock byte range lock entry\n"));
                        TALLOC_FREE(br_lck);
                        return NULL;
                }
-               br_lck->read_only = False;
+
+               data = br_lck->record->value;
        }
 
+       br_lck->read_only = read_only;
+
        talloc_set_destructor(br_lck, byte_range_lock_destructor);
 
-       data = tdb_fetch(tdb, key);
-       br_lck->lock_data = (void *)data.dptr;
        br_lck->num_locks = data.dsize / sizeof(struct lock_struct);
+       if (!(br_lck->lock_data = SMB_MALLOC_ARRAY(
+                     struct lock_struct, br_lck->num_locks))) {
+               DEBUG(0, ("malloc failed\n"));
+               TALLOC_FREE(br_lck);
+               return NULL;
+       }
 
+       memcpy(br_lck->lock_data, data.dptr, data.dsize);
+       
        if (!fsp->lockdb_clean) {
+               int orig_num_locks = br_lck->num_locks;
 
                /* This is the first time we've accessed this. */
                /* Go through and ensure all entries exist - remove any that don't. */
                /* Makes the lockdb self cleaning at low cost. */
 
-               struct lock_struct *locks =
-                       (struct lock_struct *)br_lck->lock_data;
-
-               if (!validate_lock_entries(&br_lck->num_locks, &locks)) {
+               if (!validate_lock_entries(&br_lck->num_locks,
+                                          &br_lck->lock_data)) {
                        SAFE_FREE(br_lck->lock_data);
                        TALLOC_FREE(br_lck);
                        return NULL;
                }
 
-               /*
-                * validate_lock_entries might have changed locks. We can't
-                * use a direct pointer here because otherwise gcc warnes
-                * about strict aliasing rules being violated.
-                */
-               br_lck->lock_data = locks;
+               /* Ensure invalid locks are cleaned up in the destructor. */
+               if (orig_num_locks != br_lck->num_locks) {
+                       br_lck->modified = True;
+               }
 
                /* Mark the lockdb as "clean" as seen from this open file. */
                fsp->lockdb_clean = True;
@@ -1609,10 +1676,10 @@ static struct byte_range_lock *brl_get_locks_internal(TALLOC_CTX *mem_ctx,
 
        if (DEBUGLEVEL >= 10) {
                unsigned int i;
-               struct lock_struct *locks = (struct lock_struct *)br_lck->lock_data;
-               DEBUG(10,("brl_get_locks_internal: %u current locks on dev=%.0f, inode=%.0f\n",
+               struct lock_struct *locks = br_lck->lock_data;
+               DEBUG(10,("brl_get_locks_internal: %u current locks on file_id %s\n",
                        br_lck->num_locks,
-                       (double)fsp->dev, (double)fsp->inode ));
+                         file_id_static_string(&fsp->file_id)));
                for( i = 0; i < br_lck->num_locks; i++) {
                        print_lock_struct(i, &locks[i]);
                }
@@ -1631,3 +1698,109 @@ struct byte_range_lock *brl_get_locks_readonly(TALLOC_CTX *mem_ctx,
 {
        return brl_get_locks_internal(mem_ctx, fsp, True);
 }
+
+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 = (struct server_id *)p1;
+       const struct server_id *i2 = (struct server_id *)p2;
+
+       if (i1->pid < i2->pid) return -1;
+       if (i2->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.
+ */
+
+static 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_P(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;
+       }
+
+       qsort(state->pids, state->num_pids, sizeof(state->pids[0]),
+             compare_procids);
+
+       ZERO_STRUCT(last_pid);
+
+       for (i=0; i<state->num_pids; i++) {
+               if (procid_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;
+}
+
+void brl_register_msgs(struct messaging_context *msg_ctx)
+{
+       messaging_register(msg_ctx, NULL, MSG_SMB_BRL_VALIDATE,
+                          brl_revalidate);
+}