Ok - this is the *third* implementation of this (third time's the charm :-).

This implementation keeps all POSIX lock records in a separate in memory
tdb database only known about in locking/posix.c. In addition, the pending
close fd's are also held in a tdb which has an array of fd's indexed by
device and inode.

The walk-split code uglyness has been moved to posix.c from brlock.c,
which is the only place that needs to know about it, and the extra
functions hacked into brlock to expose internal state have been removed.

This implementation passes smbtorture locktest4, the only thing I need
to check now for completeness is what to do about lock upgrade/downgrades
which Win32 allows under some *very* strange circumstances.

Jeremy.
(This used to be commit 3f655de1c764b9ee1472a111621d4317f19f624d)

1 files changed, 0 insertions, 13 deletions

diff --git a/source3/include/smb.h b/source3/include/smb.h
index ee14466cf7..f61c8cbbad 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -516,19 +516,6 @@ struct uid_cache {
   uid_t list[UID_CACHE_SIZE];
 };
 
-/*
- * Structure used when splitting a lock range
- * into a POSIX lock range. Doubly linked list.
- */
-
-struct unlock_list {
-	struct unlock_list *next;
-	struct unlock_list *prev;
-	SMB_BIG_UINT start;
-	SMB_BIG_UINT size;
-	uint16 smbpid;
-};
-
 typedef struct
 {
   char *name;