diff options
| author | Tim Prouty <tprouty@samba.org> | 2008-12-06 16:08:35 -0800 |
|---|---|---|
| committer | Tim Prouty <tprouty@samba.org> | 2008-12-09 18:06:49 -0800 |
| commit | 7b9f6dda131f471ae61c12e7eb06d67b8f02b1cf (patch) | |
| tree | 7e948a71bc8d910f439d3d429eb9d31ccf334ade /source3/modules | |
| parent | 4a9b092eb43603bae6190b8a5fdee20c9ebae26c (diff) | |
| download | samba-7b9f6dda131f471ae61c12e7eb06d67b8f02b1cf.tar.gz samba-7b9f6dda131f471ae61c12e7eb06d67b8f02b1cf.tar.bz2 samba-7b9f6dda131f471ae61c12e7eb06d67b8f02b1cf.zip | |
s3: [3/3]: Fix a delete on close divergence from windows and the associated torture test
This third patch cleans up by removing all of the code that is made
obsolete by the first patch. It should cause no functional changes.
Diffstat (limited to 'source3/modules')
| -rw-r--r-- | source3/modules/onefs_open.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/source3/modules/onefs_open.c b/source3/modules/onefs_open.c index bda5e7e91a..d0310d0174 100644 --- a/source3/modules/onefs_open.c +++ b/source3/modules/onefs_open.c @@ -1182,7 +1182,7 @@ NTSTATUS onefs_open_file_ntcreate(connection_struct *conn, } set_share_mode(lck, fsp, conn->server_info->utok.uid, 0, - fsp->oplock_type, true); + fsp->oplock_type); /* Handle strange delete on close create semantics. */ if (create_options & FILE_DELETE_ON_CLOSE) { @@ -1521,8 +1521,7 @@ static NTSTATUS onefs_open_directory(connection_struct *conn, return NT_STATUS_DELETE_PENDING; } - set_share_mode(lck, fsp, conn->server_info->utok.uid, 0, NO_OPLOCK, - true); + set_share_mode(lck, fsp, conn->server_info->utok.uid, 0, NO_OPLOCK); /* * For directories the delete on close bit at open time seems |