summaryrefslogtreecommitdiff
path: root/source3/smbd
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2013-10-24 20:53:32 +0200
committerDavid Disseldorp <ddiss@samba.org>2013-10-25 12:33:30 +0200
commit4378db981904fbd7c4b4a0bc2cf4b6eb1f6b424b (patch)
treee8772c5a39cc6876dda78eeb50bc0e0d6395a621 /source3/smbd
parent319c2d731148adda260a2fba9719ca8c6dc287f5 (diff)
downloadsamba-4378db981904fbd7c4b4a0bc2cf4b6eb1f6b424b.tar.gz
samba-4378db981904fbd7c4b4a0bc2cf4b6eb1f6b424b.tar.bz2
samba-4378db981904fbd7c4b4a0bc2cf4b6eb1f6b424b.zip
Revert "smbd: Move oplock handling together"
This reverts commit e689b7d51e6ffd848ab10e160dca2c3a03fc750b. This is a change in behaviour which needs much further investigation and testing. Signed-off-by: Volker Lendecke <vl@samba.org> Reviewed-by: David Disseldorp <ddiss@samba.org>
Diffstat (limited to 'source3/smbd')
-rw-r--r--source3/smbd/open.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index 8ae2246794..28c2c1c844 100644
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -2668,6 +2668,13 @@ static NTSTATUS open_file_ntcreate(connection_struct *conn,
fsp->access_mask = access_mask | FILE_READ_ATTRIBUTES;
}
+ if (file_existed) {
+ /* stat opens on existing files don't get oplocks. */
+ if (is_stat_open(open_access_mask)) {
+ oplock_request = NO_OPLOCK;
+ }
+ }
+
if (new_file_created) {
info = FILE_WAS_CREATED;
} else {
@@ -2687,13 +2694,6 @@ static NTSTATUS open_file_ntcreate(connection_struct *conn,
* file structs.
*/
- if (file_existed) {
- /* stat opens on existing files don't get oplocks. */
- if (is_stat_open(open_access_mask)) {
- oplock_request = NO_OPLOCK;
- }
- }
-
grant_fsp_oplock_type(fsp, lck, oplock_request);
status = set_file_oplock(fsp);