From: Volker Lendecke <vl@samba.org>
Date: Thu, 15 Dec 2011 13:33:06 +0000 (+0100)
Subject: s3: Slightly simplify delay_for_batch_oplocks
X-Git-Url: http://git.samba.org/?p=mat%2Fsamba.git;a=commitdiff_plain;h=b3d8ecaf52851493afa7ff07d8cfd10cd32d99e6

s3: Slightly simplify delay_for_batch_oplocks
---

diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index 9174388a8b..fefed85d0c 100644
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -1158,13 +1158,13 @@ static bool delay_for_batch_oplocks(files_struct *fsp,
 	if ((oplock_request & INTERNAL_OPEN_ONLY) || is_stat_open(fsp->access_mask)) {
 		return false;
 	}
-
-	if (batch_entry != NULL) {
-		/* Found a batch oplock */
-		send_break_message(fsp, batch_entry, mid, oplock_request);
-		return true;
+	if (batch_entry == NULL) {
+		return false;
 	}
-	return false;
+
+	/* Found a batch oplock */
+	send_break_message(fsp, batch_entry, mid, oplock_request);
+	return true;
 }
 
 static bool delay_for_exclusive_oplocks(files_struct *fsp,