From 4378db981904fbd7c4b4a0bc2cf4b6eb1f6b424b Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Thu, 24 Oct 2013 20:53:32 +0200 Subject: 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 Reviewed-by: David Disseldorp --- source3/smbd/open.c | 14 +++++++------- 1 file 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); -- cgit