summaryrefslogtreecommitdiff
path: root/source3/locking
diff options
context:
space:
mode:
authorVolker Lendecke <vlendec@samba.org>2007-05-07 09:35:35 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:21:52 -0500
commite6383f47629368d9dd4e803f17566a24e9d7359e (patch)
treecebde89910087c3220786f209da2c4e32a71bc46 /source3/locking
parentd1153fc79076741571b203b1d70f1536bde208f0 (diff)
downloadsamba-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/locking')
-rw-r--r--source3/locking/brlock.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/source3/locking/brlock.c b/source3/locking/brlock.c
index 88f993e14b..c3a3ce1cb6 100644
--- a/source3/locking/brlock.c
+++ b/source3/locking/brlock.c
@@ -724,7 +724,7 @@ static NTSTATUS brl_lock_posix(struct byte_range_lock *br_lck,
NTSTATUS brl_lock(struct byte_range_lock *br_lck,
uint32 smbpid,
- struct process_id pid,
+ struct server_id pid,
br_off start,
br_off size,
enum brl_type lock_type,
@@ -1039,7 +1039,7 @@ static BOOL brl_unlock_posix(struct byte_range_lock *br_lck, const struct lock_s
BOOL brl_unlock(struct byte_range_lock *br_lck,
uint32 smbpid,
- struct process_id pid,
+ struct server_id pid,
br_off start,
br_off size,
enum brl_flavour lock_flav)
@@ -1069,7 +1069,7 @@ BOOL brl_unlock(struct byte_range_lock *br_lck,
BOOL brl_locktest(struct byte_range_lock *br_lck,
uint32 smbpid,
- struct process_id pid,
+ struct server_id pid,
br_off start,
br_off size,
enum brl_type lock_type,
@@ -1127,7 +1127,7 @@ BOOL brl_locktest(struct byte_range_lock *br_lck,
NTSTATUS brl_lockquery(struct byte_range_lock *br_lck,
uint32 *psmbpid,
- struct process_id pid,
+ struct server_id pid,
br_off *pstart,
br_off *psize,
enum brl_type *plock_type,
@@ -1195,7 +1195,7 @@ NTSTATUS brl_lockquery(struct byte_range_lock *br_lck,
BOOL brl_lock_cancel(struct byte_range_lock *br_lck,
uint32 smbpid,
- struct process_id pid,
+ struct server_id pid,
br_off start,
br_off size,
enum brl_flavour lock_flav)
@@ -1252,7 +1252,7 @@ void brl_close_fnum(struct byte_range_lock *br_lck)
unsigned int i, j, dcount=0;
int num_deleted_windows_locks = 0;
struct lock_struct *locks = br_lck->lock_data;
- struct process_id pid = procid_self();
+ struct server_id pid = procid_self();
BOOL unlock_individually = False;
if(lp_posix_locking(fsp->conn->params)) {