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/locking.c | |
| parent | 0159344d4c55d9bea7f7938b6a3e750177fe6108 (diff) | |
| download | samba-73b200064fea77037f15cceeda303469b3e78624.tar.gz samba-73b200064fea77037f15cceeda303469b3e78624.tar.bz2 samba-73b200064fea77037f15cceeda303469b3e78624.zip | |
s3:util: rename procid_equal() to serverid_equal()
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Diffstat (limited to 'source3/locking/locking.c')
| -rw-r--r-- | source3/locking/locking.c | 6 |
1 files changed, 3 insertions, 3 deletions
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)); } |