summaryrefslogtreecommitdiff
path: root/source4/ntvfs/posix/vfs_posix.h
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2004-10-18 09:16:55 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:00:00 -0500
commit43a80e1d83dad9450014b2a7e0ad5a5e495f69ce (patch)
tree64f0abd7998874cd067bd20c15504b93324d6906 /source4/ntvfs/posix/vfs_posix.h
parent0ca4a7700509b399e04ac93105962b1739c7a13c (diff)
downloadsamba-43a80e1d83dad9450014b2a7e0ad5a5e495f69ce.tar.gz
samba-43a80e1d83dad9450014b2a7e0ad5a5e495f69ce.tar.bz2
samba-43a80e1d83dad9450014b2a7e0ad5a5e495f69ce.zip
r3031: added support for lock cancelation, which effectively just triggers an early lock timeout
added support for more of the bizarre special lock offset semantics of w2k3 (This used to be commit d5bfc910b1200fb283e26572dc57fcf93652fd32)
Diffstat (limited to 'source4/ntvfs/posix/vfs_posix.h')
-rw-r--r--source4/ntvfs/posix/vfs_posix.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/source4/ntvfs/posix/vfs_posix.h b/source4/ntvfs/posix/vfs_posix.h
index e83f0479a9..6aaa43a213 100644
--- a/source4/ntvfs/posix/vfs_posix.h
+++ b/source4/ntvfs/posix/vfs_posix.h
@@ -123,8 +123,12 @@ struct pvfs_file {
/* we need this hook back to our parent for lock destruction */
struct pvfs_state *pvfs;
+
+ /* a list of pending locks - used for locking cancel operations */
+ struct pvfs_pending_lock *pending_list;
};
+
struct pvfs_mangle_context {
uint8_t char_flags[256];
/*