diff options
author | Jeremy Allison <jra@samba.org> | 2010-05-07 06:20:50 -0700 |
---|---|---|
committer | Jeremy Allison <jra@samba.org> | 2010-05-07 06:20:50 -0700 |
commit | adf4833792f36653bc8a854aeff47598a046dad6 (patch) | |
tree | 5b7855392d7204218df45563e09486957a3f6d9e /source3/include/locking.h | |
parent | 6fd4861d9def34c4dccce214c78bfbcc0fa291fd (diff) | |
download | samba-adf4833792f36653bc8a854aeff47598a046dad6.tar.gz samba-adf4833792f36653bc8a854aeff47598a046dad6.tar.bz2 samba-adf4833792f36653bc8a854aeff47598a046dad6.zip |
This patch looks bigger than it is. It does 2 things. 1). Renames smbpid -> smblctx in our locking code. 2). Widens smblctx to 64-bits internally. Preparing to use the SMB2 handle as the locking context.
Jeremy.
Diffstat (limited to 'source3/include/locking.h')
-rw-r--r-- | source3/include/locking.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source3/include/locking.h b/source3/include/locking.h index ee59cad643..88104b0fef 100644 --- a/source3/include/locking.h +++ b/source3/include/locking.h @@ -36,7 +36,7 @@ enum brl_flavour {WINDOWS_LOCK = 0, POSIX_LOCK = 1}; this client */ struct lock_context { - uint32 smbpid; + uint64_t smblctx; uint16 tid; struct server_id pid; }; @@ -88,8 +88,8 @@ struct blocking_lock_record { int lock_num; uint64_t offset; uint64_t count; - uint32_t lock_pid; - uint32_t blocking_pid; /* PID that blocks us. */ + uint64_t smblctx; + uint64_t blocking_smblctx; /* Context that blocks us. */ enum brl_flavour lock_flav; enum brl_type lock_type; struct smb_request *req; @@ -97,7 +97,7 @@ struct blocking_lock_record { }; struct smbd_lock_element { - uint32_t smbpid; + uint64_t smblctx; enum brl_type brltype; uint64_t offset; uint64_t count; |