summaryrefslogtreecommitdiff
path: root/source3/include
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2006-04-12 23:00:58 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 11:16:00 -0500
commitfdd55885da4e3270c9bb5c4a682c1cd980a6040a (patch)
treeae6d1de9ac0465034dd32137cfd7a96bbacc31f3 /source3/include
parent1014fa19b53b2bd0cc3533a5c54447433376d3e6 (diff)
downloadsamba-fdd55885da4e3270c9bb5c4a682c1cd980a6040a.tar.gz
samba-fdd55885da4e3270c9bb5c4a682c1cd980a6040a.tar.bz2
samba-fdd55885da4e3270c9bb5c4a682c1cd980a6040a.zip
r15060: The brlock code gets called a lot. Ensure we keep the
key around while we're using it - saves many calls to locking_key() (now deleted). Jeremy. (This used to be commit 2f8b527dcf4a36fbb933ce79c720c0425de76b4a)
Diffstat (limited to 'source3/include')
-rw-r--r--source3/include/smb.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/source3/include/smb.h b/source3/include/smb.h
index 9531ae2903..be994a9fdd 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -836,10 +836,18 @@ struct parm_struct {
enum brl_type {READ_LOCK, WRITE_LOCK, PENDING_LOCK, UNLOCK_LOCK};
enum brl_flavour {WINDOWS_LOCK = 0, POSIX_LOCK = 1};
+/* The key used in the brlock database. */
+
+struct lock_key {
+ SMB_DEV_T device;
+ SMB_INO_T inode;
+};
+
struct byte_range_lock {
files_struct *fsp;
unsigned int num_locks;
BOOL modified;
+ struct lock_key key;
void *lock_data;
};