From 73b200064fea77037f15cceeda303469b3e78624 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Sat, 16 Jun 2012 00:26:26 +0200 Subject: s3:util: rename procid_equal() to serverid_equal() Signed-off-by: Stefan Metzmacher --- source3/locking/brlock.c | 8 ++++---- source3/locking/locking.c | 6 +++--- source3/locking/posix.c | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) (limited to 'source3/locking') diff --git a/source3/locking/brlock.c b/source3/locking/brlock.c index 836bbb49a7..7150936253 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; inum_pids; i++) { - if (procid_equal(&last_pid, &state->pids[i])) { + if (serverid_equal(&last_pid, &state->pids[i])) { /* * We've seen that one already */ diff --git a/source3/locking/locking.c b/source3/locking/locking.c index c7d8fb4fa4..95e9b77553 100644 --- a/source3/locking/locking.c +++ b/source3/locking/locking.c @@ -553,7 +553,7 @@ bool rename_share_filename(struct messaging_context *msg_ctx, se->name_hash = new_name_hash; /* But not to ourselves... */ - if (procid_equal(&se->pid, &self_pid)) { + if (serverid_equal(&se->pid, &self_pid)) { continue; } @@ -755,7 +755,7 @@ static bool share_modes_identical(struct share_mode_entry *e1, sharing the same share mode entry may validly differ in fsp->share_access field. */ - return (procid_equal(&e1->pid, &e2->pid) && + return (serverid_equal(&e1->pid, &e2->pid) && file_id_equal(&e1->id, &e2->id) && e1->share_file_id == e2->share_file_id ); } @@ -763,7 +763,7 @@ static bool share_modes_identical(struct share_mode_entry *e1, static bool deferred_open_identical(struct share_mode_entry *e1, struct share_mode_entry *e2) { - return (procid_equal(&e1->pid, &e2->pid) && + return (serverid_equal(&e1->pid, &e2->pid) && (e1->op_mid == e2->op_mid) && file_id_equal(&e1->id, &e2->id)); } diff --git a/source3/locking/posix.c b/source3/locking/posix.c index 02d9b6d3e3..e5320f8705 100644 --- a/source3/locking/posix.c +++ b/source3/locking/posix.c @@ -777,7 +777,7 @@ static struct lock_list *posix_lock_list(TALLOC_CTX *ctx, } /* Ignore locks not owned by this process. */ - if (!procid_equal(&lock->context.pid, &lock_ctx->pid)) { + if (!serverid_equal(&lock->context.pid, &lock_ctx->pid)) { continue; } -- cgit