diff options
| author | Volker Lendecke <vlendec@samba.org> | 2007-05-07 09:35:35 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:21:52 -0500 |
| commit | e6383f47629368d9dd4e803f17566a24e9d7359e (patch) | |
| tree | cebde89910087c3220786f209da2c4e32a71bc46 /source3/include/locking.h | |
| parent | d1153fc79076741571b203b1d70f1536bde208f0 (diff) | |
| download | samba-e6383f47629368d9dd4e803f17566a24e9d7359e.tar.gz samba-e6383f47629368d9dd4e803f17566a24e9d7359e.tar.bz2 samba-e6383f47629368d9dd4e803f17566a24e9d7359e.zip | |
r22736: Start to merge the low-hanging fruit from the now 7000-line cluster patch.
This changes "struct process_id" to "struct server_id", keeping both is
just too much hassle. No functional change (I hope ;-))
Volker
(This used to be commit 0ad4b1226c9d91b72136310d3bbb640d2c5d67b8)
Diffstat (limited to 'source3/include/locking.h')
| -rw-r--r-- | source3/include/locking.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source3/include/locking.h b/source3/include/locking.h index a62b461c10..cc4d83fdcd 100644 --- a/source3/include/locking.h +++ b/source3/include/locking.h @@ -39,7 +39,7 @@ enum brl_flavour {WINDOWS_LOCK = 0, POSIX_LOCK = 1}; struct lock_context { uint32 smbpid; uint16 tid; - struct process_id pid; + struct server_id pid; }; /* The key used in the brlock database. */ @@ -61,13 +61,13 @@ struct byte_range_lock { }; #define BRLOCK_FN_CAST() \ - void (*)(SMB_DEV_T dev, SMB_INO_T ino, struct process_id pid, \ + void (*)(SMB_DEV_T dev, SMB_INO_T ino, struct server_id pid, \ enum brl_type lock_type, \ enum brl_flavour lock_flav, \ br_off start, br_off size) #define BRLOCK_FN(fn) \ - void (*fn)(SMB_DEV_T dev, SMB_INO_T ino, struct process_id pid, \ + void (*fn)(SMB_DEV_T dev, SMB_INO_T ino, struct server_id pid, \ enum brl_type lock_type, \ enum brl_flavour lock_flav, \ br_off start, br_off size) |