summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2011-12-14 10:43:36 +0100
committerVolker Lendecke <vl@samba.org>2011-12-14 17:34:21 +0100
commitc889c8d7055102276bc10ae00c60f7ebc5a293c3 (patch)
treec37725418e67ae7fef2dddbc26376027a0dfe72d
parentf7e84f2809e2f00f786a2042979c73f29275edec (diff)
downloadsamba-c889c8d7055102276bc10ae00c60f7ebc5a293c3.tar.gz
samba-c889c8d7055102276bc10ae00c60f7ebc5a293c3.tar.bz2
samba-c889c8d7055102276bc10ae00c60f7ebc5a293c3.zip
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.
-rw-r--r--source3/smbd/open.c8
1 files changed, 3 insertions, 5 deletions
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; 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));