summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2012-06-02 13:39:33 +0200
committerStefan Metzmacher <metze@samba.org>2012-06-03 17:23:27 +0200
commit9dba59d0269f617af02bdc681261436a96ec34d1 (patch)
tree20143dfc6608eb5f1370ae8f809972e113e49e8c
parentad26c2a726b3a4688648d54a3e88bd38c8db5607 (diff)
downloadsamba-9dba59d0269f617af02bdc681261436a96ec34d1.tar.gz
samba-9dba59d0269f617af02bdc681261436a96ec34d1.tar.bz2
samba-9dba59d0269f617af02bdc681261436a96ec34d1.zip
s3:smbd/oplock: avoid procid_is_me()
metze
-rw-r--r--source3/smbd/oplock.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/source3/smbd/oplock.c b/source3/smbd/oplock.c
index 190a9d39f8..19886fc79d 100644
--- a/source3/smbd/oplock.c
+++ b/source3/smbd/oplock.c
@@ -494,6 +494,7 @@ static void process_oplock_break_message(struct messaging_context *msg_ctx,
struct smbd_server_connection *sconn =
talloc_get_type_abort(private_data,
struct smbd_server_connection);
+ struct server_id self = messaging_server_id(sconn->msg_ctx);
struct kernel_oplocks *koplocks = sconn->oplocks.kernel_ops;
if (data->data == NULL) {
@@ -562,7 +563,7 @@ static void process_oplock_break_message(struct messaging_context *msg_ctx,
/* Need to wait before sending a break
message if we sent ourselves this message. */
- if (procid_is_me(&src)) {
+ if (procid_equal(&self, &src)) {
wait_before_sending_break();
}
@@ -802,6 +803,7 @@ static void do_break_to_none(struct tevent_req *req)
{
struct break_to_none_state *state = tevent_req_callback_data(
req, struct break_to_none_state);
+ struct server_id self = messaging_server_id(state->sconn->msg_ctx);
bool ret;
int i;
struct share_mode_lock *lck;
@@ -873,7 +875,7 @@ static void do_break_to_none(struct tevent_req *req)
* Bugid #5980.
*/
- if (procid_is_me(&share_entry->pid)) {
+ if (procid_equal(&self, &share_entry->pid)) {
struct files_struct *cur_fsp =
initial_break_processing(state->sconn,
share_entry->id,