From c889c8d7055102276bc10ae00c60f7ebc5a293c3 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Wed, 14 Dec 2011 10:43:36 +0100 Subject: 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. --- source3/smbd/open.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'source3') diff --git a/source3/smbd/open.c b/source3/smbd/open.c index 461206893b..433bc09022 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; inum_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)); -- cgit