diff options
| author | Michael Adam <obnox@samba.org> | 2012-06-16 00:26:26 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2012-06-21 08:27:32 +0200 |
| commit | 73b200064fea77037f15cceeda303469b3e78624 (patch) | |
| tree | baba4f462d2b86065daab4e5332db832830408e7 /source3/locking/brlock.c | |
| parent | 0159344d4c55d9bea7f7938b6a3e750177fe6108 (diff) | |
| download | samba-73b200064fea77037f15cceeda303469b3e78624.tar.gz samba-73b200064fea77037f15cceeda303469b3e78624.tar.xz samba-73b200064fea77037f15cceeda303469b3e78624.zip | |
s3:util: rename procid_equal() to serverid_equal()
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Diffstat (limited to 'source3/locking/brlock.c')
| -rw-r--r-- | source3/locking/brlock.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source3/locking/brlock.c b/source3/locking/brlock.c index 836bbb49a78..71509362532 100644 --- a/source3/locking/brlock.c +++ b/source3/locking/brlock.c @@ -69,7 +69,7 @@ static void print_lock_struct(unsigned int i, struct lock_struct *pls) bool brl_same_context(const struct lock_context *ctx1, const struct lock_context *ctx2) { - return (procid_equal(&ctx1->pid, &ctx2->pid) && + return (serverid_equal(&ctx1->pid, &ctx2->pid) && (ctx1->smblctx == ctx2->smblctx) && (ctx1->tid == ctx2->tid)); } @@ -252,7 +252,7 @@ NTSTATUS brl_lock_failed(files_struct *fsp, const struct lock_struct *lock, bool return NT_STATUS_FILE_LOCK_CONFLICT; } - if (procid_equal(&lock->context.pid, &fsp->last_lock_failure.context.pid) && + if (serverid_equal(&lock->context.pid, &fsp->last_lock_failure.context.pid) && lock->context.tid == fsp->last_lock_failure.context.tid && lock->fnum == fsp->last_lock_failure.fnum && lock->start == fsp->last_lock_failure.start) { @@ -1509,7 +1509,7 @@ void brl_close_fnum(struct messaging_context *msg_ctx, for (i=0; i < num_locks_copy; i++) { struct lock_struct *lock = &locks_copy[i]; - if (lock->context.tid == tid && procid_equal(&lock->context.pid, &pid) && + if (lock->context.tid == tid && serverid_equal(&lock->context.pid, &pid) && (lock->fnum == fnum)) { brl_unlock(msg_ctx, br_lck, @@ -1958,7 +1958,7 @@ void brl_revalidate(struct messaging_context *msg_ctx, ZERO_STRUCT(last_pid); for (i=0; i<state->num_pids; i++) { - if (procid_equal(&last_pid, &state->pids[i])) { + if (serverid_equal(&last_pid, &state->pids[i])) { /* * We've seen that one already */ |