lib: Remove #define serverid_equal server_id_equal

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

3 files changed, 7 insertions, 6 deletions

diff --git a/source3/locking/brlock.c b/source3/locking/brlock.c
index f3fb75ef136..c0ff99a21c5 100644
--- a/source3/locking/brlock.c
+++ b/source3/locking/brlock.c
@@ -112,7 +112,7 @@ const struct GUID *brl_req_guid(const struct byte_range_lock *brl)
 static bool brl_same_context(const struct lock_context *ctx1,
 			     const struct lock_context *ctx2)
 {
-	return (serverid_equal(&ctx1->pid, &ctx2->pid) &&
+	return (server_id_equal(&ctx1->pid, &ctx2->pid) &&
 		(ctx1->smblctx == ctx2->smblctx) &&
 		(ctx1->tid == ctx2->tid));
 }
@@ -1466,7 +1466,8 @@ void brl_close_fnum(struct byte_range_lock *br_lck)
 	for (i=0; i < num_locks_copy; i++) {
 		struct lock_struct *lock = &locks_copy[i];
 
-		if (lock->context.tid == tid && serverid_equal(&lock->context.pid, &pid) &&
+		if (lock->context.tid == tid &&
+		    server_id_equal(&lock->context.pid, &pid) &&
 				(lock->fnum == fnum)) {
 			brl_unlock(
 				br_lck,
@@ -1525,7 +1526,7 @@ bool brl_mark_disconnected(struct files_struct *fsp)
 			return false;
 		}
 
-		if (!serverid_equal(&lock->context.pid, &self)) {
+		if (!server_id_equal(&lock->context.pid, &self)) {
 			TALLOC_FREE(br_lck);
 			return false;
 		}
diff --git a/source3/locking/locking.c b/source3/locking/locking.c
index 568d2002229..f90458d9d4f 100644
--- a/source3/locking/locking.c
+++ b/source3/locking/locking.c
@@ -532,7 +532,7 @@ static bool rename_share_filename_fn(
 	e->name_hash = state->new_name_hash;
 	*modified = true;
 
-	ok = serverid_equal(&e->pid, &state->self);
+	ok = server_id_equal(&e->pid, &state->self);
 	if (ok) {
 		return false;
 	}
diff --git a/source3/locking/posix.c b/source3/locking/posix.c
index 3b75cfe481a..91485133eb2 100644
--- a/source3/locking/posix.c
+++ b/source3/locking/posix.c
@@ -681,7 +681,7 @@ static struct lock_list *posix_lock_list(TALLOC_CTX *ctx,
 		}
 
 		/* Ignore locks not owned by this process. */
-		if (!serverid_equal(&lock->context.pid, &lock_ctx->pid)) {
+		if (!server_id_equal(&lock->context.pid, &lock_ctx->pid)) {
 			continue;
 		}
 
@@ -1223,7 +1223,7 @@ static bool locks_exist_on_context(const struct lock_struct *plocks,
 		}
 
 		/* Ignore locks not owned by this process. */
-		if (!serverid_equal(&lock->context.pid, &lock_ctx->pid)) {
+		if (!server_id_equal(&lock->context.pid, &lock_ctx->pid)) {
 			continue;
 		}