diff options
| author | Stefan Metzmacher <metze@samba.org> | 2006-05-15 12:22:00 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:07:00 -0500 |
| commit | 5e6d1ea2618851ef99522a806f36916127e5294a (patch) | |
| tree | 4671b44c2bca74104a132ff432a4e355cb3a2d1a /source4/ntvfs/posix/vfs_posix.h | |
| parent | be0bd9fa336464e7c1fa2ab7cc5cd34075d595ce (diff) | |
| download | samba-5e6d1ea2618851ef99522a806f36916127e5294a.tar.gz samba-5e6d1ea2618851ef99522a806f36916127e5294a.tar.bz2 samba-5e6d1ea2618851ef99522a806f36916127e5294a.zip | |
r15614: the byte range locking error handling caches the last failed lock
per file handle and not per tree connect
metze
(This used to be commit 5d825261c0b8341f0a7f0f6d96d83807352566f4)
Diffstat (limited to 'source4/ntvfs/posix/vfs_posix.h')
| -rw-r--r-- | source4/ntvfs/posix/vfs_posix.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source4/ntvfs/posix/vfs_posix.h b/source4/ntvfs/posix/vfs_posix.h index 335cfdf4e0..39481c03b1 100644 --- a/source4/ntvfs/posix/vfs_posix.h +++ b/source4/ntvfs/posix/vfs_posix.h @@ -134,9 +134,6 @@ struct pvfs_file_handle { /* a unique file key to be used for open file locking */ DATA_BLOB odb_locking_key; - /* a unique file key to be used for byte range locking */ - DATA_BLOB brl_locking_key; - uint32_t create_options; /* this is set by the mode_information level. What does it do? */ @@ -178,6 +175,9 @@ struct pvfs_file { /* a list of pending locks - used for locking cancel operations */ struct pvfs_pending_lock *pending_list; + /* a file handle to be used for byte range locking */ + struct brl_handle *brl_handle; + /* a count of active locks - used to avoid calling brl_close on file close */ uint64_t lock_count; |