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

r17128: Missed a logic error in my last patch. Ensure we deal with any

Browse Source 
oplocks that were granted when we had released the lock. Fix
strange case where stat open grants a batch oplock on file
create, but grants no oplock on file open.
Jeremy.
This commit is contained in:
Jeremy Allison 2006-07-19 01:30:30 +00:00 committed by Gerald (Jerry) Carter
parent 8171c4c404
commit b7374835e6
1 changed files with 42 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
source/smbd/open.c
View File

@ -623,8 +623,11 @@ static BOOL delay_for_oplocks(struct share_mode_lock *lck,
BOOL delay_it = False;
BOOL have_level2 = False;
if ((oplock_request & INTERNAL_OPEN_ONLY) || is_stat_open(fsp->access_mask)) {
if (oplock_request & INTERNAL_OPEN_ONLY) {
fsp->oplock_type = NO_OPLOCK;
}
if ((oplock_request & INTERNAL_OPEN_ONLY) || is_stat_open(fsp->access_mask)) {
return False;
}
@ -1582,10 +1585,43 @@ NTSTATUS open_file_ntcreate(connection_struct *conn,
return NT_STATUS_SHARING_VIOLATION;
}
/*
* The share entry is again *locked*.....
*/
/* First pass - send break only on batch oplocks. */
if (delay_for_oplocks(lck, fsp, 1, oplock_request)) {
schedule_defer_open(lck, request_time);
fd_close(conn, fsp);
file_free(fsp);
TALLOC_FREE(lck);
return NT_STATUS_SHARING_VIOLATION;
}
status = open_mode_check(conn, fname, lck,
access_mask, share_access,
create_options, &file_existed);
if (NT_STATUS_IS_OK(status)) {
/* We might be going to allow this open. Check oplock status again. */
/* Second pass - send break for both batch or exclusive oplocks. */
if (delay_for_oplocks(lck, fsp, 2, oplock_request)) {
schedule_defer_open(lck, request_time);
fd_close(conn, fsp);
file_free(fsp);
TALLOC_FREE(lck);
return NT_STATUS_SHARING_VIOLATION;
}
}
if (NT_STATUS_EQUAL(status, NT_STATUS_DELETE_PENDING)) {
/* DELETE_PENDING is not deferred for a second */
fd_close(conn, fsp);
file_free(fsp);
TALLOC_FREE(lck);
return status;
}
if (!NT_STATUS_IS_OK(status)) {
struct deferred_open_record state;
@ -1609,10 +1645,6 @@ NTSTATUS open_file_ntcreate(connection_struct *conn,
return status;
}
/*
* The share entry is again *locked*.....
*/
/* note that we ignore failure for the following. It is
basically a hack for NFS, and NFS will never set one of
these only read them. Nobody but Samba can ever set a deny
@ -1653,6 +1685,11 @@ NTSTATUS open_file_ntcreate(connection_struct *conn,
fsp->access_mask = access_mask;
if (file_existed) {
/* stat opens on existing files don't get oplocks. */
if (is_stat_open(fsp->access_mask)) {
fsp->oplock_type = NO_OPLOCK;
}
if (!(flags2 & O_TRUNC)) {
info = FILE_WAS_OPENED;
} else {