The branch, v3-6-test has been updated
via 9d0a894 s3: delete requests are not special
from e059bcc sysquota: we need to list nfs4 as a separate fs name for
the sys_get_nfs_quota backend
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test
- Log -----------------------------------------------------------------
commit 9d0a8945ce9f521934d6f580d2b48abce0169a6d
Author: Volker Lendecke <[email protected]>
Date: Mon Sep 10 11:25:03 2012 +0200
s3: delete requests are not special
The only difference between batch and exclusive oplocks is the time of
the check: Batch is checked before the share mode check, exclusive after.
Signed-off-by: Jeremy Allison <[email protected]>
Fix bug #9150 - Valid open requests can cause smbd assert due to incorrect
oplock handling on delete requests.
-----------------------------------------------------------------------
Summary of changes:
source3/smbd/open.c | 14 ++------------
1 files changed, 2 insertions(+), 12 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index 3100ad0..7d6a25f 100644
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -934,11 +934,6 @@ static NTSTATUS open_mode_check(connection_struct *conn,
return NT_STATUS_OK;
}
-static bool is_delete_request(files_struct *fsp) {
- return ((fsp->access_mask == DELETE_ACCESS) &&
- (fsp->oplock_type == NO_OPLOCK));
-}
-
/*
* Send a break message to the oplock holder and delay the open for
* our client.
@@ -1083,13 +1078,8 @@ static bool delay_for_exclusive_oplocks(files_struct
*fsp,
}
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;
- }
+ send_break_message(fsp, ex_entry, mid, oplock_request);
+ return true;
}
return false;
}
--
Samba Shared Repository
