]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
Slightly simplify logic in process_lockingX()
authorVolker Lendecke <vl@samba.org>
Tue, 4 Nov 2008 13:35:44 +0000 (14:35 +0100)
committerVolker Lendecke <vl@samba.org>
Tue, 4 Nov 2008 19:52:07 +0000 (20:52 +0100)
The "else" is pointless here, we did a "return True" in the if branch.

source3/smbd/blocking.c

index 414ea9fc5cc14809f28d505fcc58314df2173737..6428c3684baa5dd23f1fa4df3e947e888c2e4261 100644 (file)
@@ -470,14 +470,15 @@ static bool process_lockingX(blocking_lock_record *blr)
 
                reply_lockingX_success(blr);
                return True;
-       } else if (!NT_STATUS_EQUAL(status,NT_STATUS_LOCK_NOT_GRANTED) &&
-                       !NT_STATUS_EQUAL(status,NT_STATUS_FILE_LOCK_CONFLICT)) {
-                       /*
-                        * We have other than a "can't get lock"
-                        * error. Free any locks we had and return an error.
-                        * Return True so we get dequeued.
-                        */
+       }
 
+       if (!NT_STATUS_EQUAL(status,NT_STATUS_LOCK_NOT_GRANTED) &&
+           !NT_STATUS_EQUAL(status,NT_STATUS_FILE_LOCK_CONFLICT)) {
+               /*
+                * We have other than a "can't get lock"
+                * error. Free any locks we had and return an error.
+                * Return True so we get dequeued.
+                */
                blocking_lock_reply_error(blr, status);
                return True;
        }