s3: Slightly simplify the logic in defer_open
authorVolker Lendecke <vl@samba.org>
Wed, 14 Dec 2011 09:43:36 +0000 (10:43 +0100)
committerVolker Lendecke <vl@samba.org>
Wed, 14 Dec 2011 16:34:21 +0000 (17:34 +0100)
Doing 3 &&ed conditions in a single if-statement is easier to understand to me
than continuing out separately.

source3/smbd/open.c

index 461206893be6a8601a019ad875605e2c41948b2e..433bc090228f6b829401391f3b7c55c8a49aba9c 100644 (file)
@@ -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));