summaryrefslogtreecommitdiff
path: root/source3/include
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2000-04-27 21:12:33 +0000
committerJeremy Allison <jra@samba.org>2000-04-27 21:12:33 +0000
commit3d3c50326ba7f32ebb2fc683a3410dc0d1f18cdc (patch)
tree6175e2abd7604bd3338f16df336906e770103eec /source3/include
parente3987ff7a638f9ea8b6794f1ed0df530d8488033 (diff)
downloadsamba-3d3c50326ba7f32ebb2fc683a3410dc0d1f18cdc.tar.gz
samba-3d3c50326ba7f32ebb2fc683a3410dc0d1f18cdc.tar.bz2
samba-3d3c50326ba7f32ebb2fc683a3410dc0d1f18cdc.zip
Did the rewrite Andrew wanted where all knowledge of POSIX locking is
removed from the smbd/open.c code. We now use a dlink list of structures indexed by dev/inode to store all pending fd's for close. This could be rewritten to use lib/hash.c if this is discovered to be too slow in use. Andrew, please take a look and let me know if this is what you had in mind. Jeremy. (This used to be commit 0487841120a7584da9a2b83b9574562c415d7024)
Diffstat (limited to 'source3/include')
-rw-r--r--source3/include/proto.h1
-rw-r--r--source3/include/smb.h3
2 files changed, 1 insertions, 3 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 79ebe331ad..8c6fcd56b7 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -831,6 +831,7 @@ int brl_forall(BRLOCK_FN(fn));
/*The following definitions come from locking/locking.c */
+BOOL fd_close_posix_locks(struct connection_struct *conn, files_struct *fsp);
BOOL is_locked(files_struct *fsp,connection_struct *conn,
SMB_BIG_UINT count,SMB_BIG_UINT offset,
enum brl_type lock_type);
diff --git a/source3/include/smb.h b/source3/include/smb.h
index 2e11d66729..6a3964e0f3 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -489,9 +489,6 @@ typedef struct files_struct
time_t pending_modtime;
int oplock_type;
int sent_oplock_break;
- int num_posix_locks;
- unsigned int num_posix_pending_closes;
- int *posix_pending_close_fds;
BOOL can_lock;
BOOL can_read;
BOOL can_write;