summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2008-11-04 14:35:44 +0100
committerVolker Lendecke <vl@samba.org>2008-11-04 20:52:07 +0100
commit3376e7a6a061c0d681a6a0e5c3aedfc82c36f65f (patch)
treea477410bba1be598f0cee80326b26dd559015410 /source3
parent59e237cae55e43b1276ebe644752c8c5d2ab74e4 (diff)
downloadsamba-3376e7a6a061c0d681a6a0e5c3aedfc82c36f65f.tar.gz
samba-3376e7a6a061c0d681a6a0e5c3aedfc82c36f65f.tar.bz2
samba-3376e7a6a061c0d681a6a0e5c3aedfc82c36f65f.zip
Slightly simplify logic in process_lockingX()
The "else" is pointless here, we did a "return True" in the if branch.
Diffstat (limited to 'source3')
-rw-r--r--source3/smbd/blocking.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/source3/smbd/blocking.c b/source3/smbd/blocking.c
index 414ea9fc5c..6428c3684b 100644
--- a/source3/smbd/blocking.c
+++ b/source3/smbd/blocking.c
@@ -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;
}