1
0
mirror of https://github.com/samba-team/samba.git synced 2025-03-30 06:50:24 +03:00

s3: Slightly simplify delay_for_exclusive_oplocks

This commit is contained in:
Volker Lendecke 2011-12-15 14:35:07 +01:00
parent b3d8ecaf52
commit 432ea5f5c6

View File

@ -1172,20 +1172,26 @@ static bool delay_for_exclusive_oplocks(files_struct *fsp,
int oplock_request,
struct share_mode_entry *ex_entry)
{
bool delay_it;
if ((oplock_request & INTERNAL_OPEN_ONLY) || is_stat_open(fsp->access_mask)) {
return false;
}
if (ex_entry != NULL) {
/* Found an exclusive or batch oplock */
bool delay_it = is_delete_request(fsp) ?
BATCH_OPLOCK_TYPE(ex_entry->op_type) : true;
if (delay_it) {
send_break_message(fsp, ex_entry, mid, oplock_request);
return true;
}
if (ex_entry == NULL) {
return false;
}
return false;
/* Found an exclusive or batch oplock */
delay_it = is_delete_request(fsp) ?
BATCH_OPLOCK_TYPE(ex_entry->op_type) : true;
if (!delay_it) {
return false;
}
send_break_message(fsp, ex_entry, mid, oplock_request);
return true;
}
static void grant_fsp_oplock_type(files_struct *fsp,