sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-11-05 04:23:51 +03:00
Code Activity

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.

Browse Source 
Jeremy.
This commit is contained in:
Jeremy Allison
2010-05-07 06:20:50 -07:00
parent 6fd4861d9d
commit adf4833792
10 changed files with 150 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source3/include/locking.h
View File

@@ -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;