From 5e6d1ea2618851ef99522a806f36916127e5294a Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Mon, 15 May 2006 12:22:00 +0000 Subject: 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) --- source4/ntvfs/posix/vfs_posix.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'source4/ntvfs/posix/vfs_posix.h') 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; -- cgit