diff options
| author | Jeremy Allison <jra@samba.org> | 2014-10-22 17:53:01 -0700 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2014-11-11 21:41:05 +0100 |
| commit | 1020c5942a996e3e900e2b81f9964dd61fc9c71d (patch) | |
| tree | 2b47c278c61aedf936897385b9bd053e609f6fed | |
| parent | a08b0e78220f84f87b2af1535d645a994a5c93ab (diff) | |
| download | samba-1020c5942a996e3e900e2b81f9964dd61fc9c71d.tar.gz samba-1020c5942a996e3e900e2b81f9964dd61fc9c71d.tar.xz samba-1020c5942a996e3e900e2b81f9964dd61fc9c71d.zip | |
s3:smbd: Don't set fsp->oplock_type before we've granted any oplocks.
It's not needed, and may lead to unexpected side effects.
grant_fsp_oplock_type() is the only place to touch this.
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
| -rw-r--r-- | source3/smbd/open.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/source3/smbd/open.c b/source3/smbd/open.c index 945850c905..28ab434f90 100644 --- a/source3/smbd/open.c +++ b/source3/smbd/open.c @@ -2423,9 +2423,6 @@ static NTSTATUS open_file_ntcreate(connection_struct *conn, * the open is done. */ fsp->posix_open = posix_open; - /* Ensure no SAMBA_PRIVATE bits can be set. */ - fsp->oplock_type = (oplock_request & ~SAMBA_PRIVATE_OPLOCK_MASK); - if (timeval_is_zero(&request_time)) { request_time = fsp->open_time; } |