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/smbd/globals.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/smbd/globals.h')
| -rw-r--r-- | source3/smbd/globals.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/smbd/globals.h b/source3/smbd/globals.h index 6543ee6f24..b6aa704f18 100644 --- a/source3/smbd/globals.h +++ b/source3/smbd/globals.h @@ -312,12 +312,12 @@ bool push_blocking_lock_request_smb2( struct byte_range_lock *br_lck, files_struct *fsp, int lock_timeout, int lock_num, - uint32_t lock_pid, + uint64_t smblctx, enum brl_type lock_type, enum brl_flavour lock_flav, uint64_t offset, uint64_t count, - uint32_t blocking_pid); + uint64_t blocking_smblctx); void process_blocking_lock_queue_smb2(struct timeval tv_curr); void cancel_pending_lock_requests_by_fid_smb2(files_struct *fsp, struct byte_range_lock *br_lck, |