diff options
| author | Volker Lendecke <vl@samba.org> | 2012-09-10 11:25:03 +0200 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2012-09-10 14:58:51 -0700 |
| commit | ab709544f4ebddc1ae1838312c43cdeb734dfc19 (patch) | |
| tree | 052c1eed5c8617b680640a12975df300332f8492 | |
| parent | 008bb29023ed6875d4ed2def0976b55051de02bf (diff) | |
| download | samba-ab709544f4ebddc1ae1838312c43cdeb734dfc19.tar.gz samba-ab709544f4ebddc1ae1838312c43cdeb734dfc19.tar.bz2 samba-ab709544f4ebddc1ae1838312c43cdeb734dfc19.zip | |
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 <jra@samba.org>
| -rw-r--r-- | source3/smbd/open.c | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/source3/smbd/open.c b/source3/smbd/open.c index 5fa45aa15d..0da238679e 100644 --- a/source3/smbd/open.c +++ b/source3/smbd/open.c @@ -1155,11 +1155,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. @@ -1330,8 +1325,6 @@ 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; } @@ -1348,15 +1341,6 @@ static bool delay_for_exclusive_oplocks(files_struct *fsp, 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; } |