From: Volker Lendecke <vl@samba.org>
Date: Wed, 14 Dec 2011 09:43:36 +0000 (+0100)
Subject: s3: Slightly simplify the logic in defer_open
X-Git-Url: http://git.samba.org/?p=kai%2Fsamba.git;a=commitdiff_plain;h=c889c8d7055102276bc10ae00c60f7ebc5a293c3

s3: Slightly simplify the logic in defer_open

Doing 3 &&ed conditions in a single if-statement is easier to understand to me
than continuing out separately.
---

diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index 461206893be..433bc090228 100644
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -1275,11 +1275,9 @@ static void defer_open(struct share_mode_lock *lck,
 	for (i=0; i<lck->num_share_modes; i++) {
 		struct share_mode_entry *e = &lck->share_modes[i];
 
-		if (!is_deferred_open_entry(e)) {
-			continue;
-		}
-
-		if (procid_is_me(&e->pid) && (e->op_mid == req->mid)) {
+		if (is_deferred_open_entry(e) &&
+		    procid_is_me(&e->pid) &&
+		    (e->op_mid == req->mid)) {
 			DEBUG(0, ("Trying to defer an already deferred "
 				"request: mid=%llu, exiting\n",
 				(unsigned long long)req->mid));