sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-26 10:04:02 +03:00
Code

smbd: Use MSG_SMB_BREAK_REQUEST for async l2 breaks

Browse Source 
Now that we transmit the level we want to break to via the msg.op_type
we can unify MSG_SMB_BREAK_REQUEST and MSG_SMB_ASYNC_LEVEL2_BREAK and
thus simplify the code a bit.

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
This commit is contained in:
Volker Lendecke 2013-10-22 11:33:42 +00:00 committed by Stefan Metzmacher
parent 6c3b41cfc2
commit d9a1d54b79
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source3/smbd/oplock.c
View File

@ -577,8 +577,14 @@ static void process_oplock_break_message(struct messaging_context *msg_ctx,
OPLOCKLEVEL_II : OPLOCKLEVEL_NONE);
}
if ((fsp->oplock_type == LEVEL_II_OPLOCK) && (break_to == NO_OPLOCK)) {
/*
* This is an async break without a reply and thus no timeout
*/
remove_oplock(fsp);
return;
}
fsp->sent_oplock_break = break_to_level2 ? LEVEL_II_BREAK_SENT:BREAK_TO_NONE_SENT;
add_oplock_timeout_handler(fsp);
}
@ -767,9 +773,11 @@ static void do_break_to_none(struct tevent_context *ctx,
}
share_mode_entry_to_message(msg, share_entry);
/* Overload entry->op_type */
SSVAL(msg,OP_BREAK_MSG_OP_TYPE_OFFSET, NO_OPLOCK);
messaging_send_buf(state->sconn->msg_ctx, share_entry->pid,
MSG_SMB_ASYNC_LEVEL2_BREAK,
MSG_SMB_BREAK_REQUEST,
(uint8 *)msg, sizeof(msg));
}