From: Volker Lendecke <vl@samba.org>
Date: Fri, 9 Aug 2019 11:38:40 +0000 (+0200)
Subject: smbd: Slightly simplify delay_for_oplock()
X-Git-Tag: tdb-1.4.2~22
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d1cb71fa500ede015600ace58411c857b051794e;p=thirdparty%2Fsamba.git

smbd: Slightly simplify delay_for_oplock()

This is never called for INTERNAL_OPENs anymore, see
handle_share_mode_lease()

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
---

diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index cdc69e1af1a..f5f91f9e11b 100644
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -1871,8 +1871,7 @@ static bool delay_for_oplock(files_struct *fsp,
 	const uint32_t delay_mask = have_sharing_violation ?
 		SMB2_LEASE_HANDLE : SMB2_LEASE_WRITE;
 
-	if ((oplock_request & INTERNAL_OPEN_ONLY) ||
-	    is_stat_open(fsp->access_mask)) {
+	if (is_stat_open(fsp->access_mask)) {
 		return false;
 	}