X-Git-Url: http://git.samba.org/?a=blobdiff_plain;f=source3%2Fsmbd%2Fopen.c;h=843bb2b6a8f44ab6e9df7a701c5a372dd15b3e43;hb=b20ca77e2a9d111eb2e77d0b804fe7505b07e418;hp=dfa45ef739a868b201eff51b14de8c035d5d5810;hpb=30567b8f9bc0f5a39a3a65039277aa5f839622cd;p=samba.git

diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index dfa45ef739a..843bb2b6a8f 100644
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -894,11 +894,6 @@ static NTSTATUS open_mode_check(connection_struct *conn,
 	return NT_STATUS_OK;
 }
 
-static bool is_delete_request(files_struct *fsp) {
-	return ((fsp->access_mask == DELETE_ACCESS) &&
-		(fsp->oplock_type == NO_OPLOCK));
-}
-
 /*
  * Send a break message to the oplock holder and delay the open for
  * our client.
@@ -1002,13 +997,9 @@ static bool delay_for_oplocks(struct share_mode_lock *lck,
 	}
 
 	if (exclusive != NULL) { /* Found an exclusive oplock */
-		bool delay_it = is_delete_request(fsp) ?
-				BATCH_OPLOCK_TYPE(exclusive->op_type) :	true;
 		SMB_ASSERT(!have_level2);
-		if (delay_it) {
-			send_break_message(fsp, exclusive, mid, oplock_request);
-			return true;
-		}
+		send_break_message(fsp, exclusive, mid, oplock_request);
+		return true;
 	}
 
 	/*