sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

smbd: First watch, then defer

Browse Source 
We exit if any of these if-statement fails, so a simple swap should not
make a difference.

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
This commit is contained in:
Volker Lendecke 2014-06-20 14:15:19 +00:00
parent 0ead434b84
commit 0c2e763aaa
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
source3/smbd/open.c
View File

@ -1580,11 +1580,6 @@ static void defer_open(struct share_mode_lock *lck,
*open_rec = *state;
if (!push_deferred_open_message_smb(req, request_time, timeout,
state->id, open_rec)) {
TALLOC_FREE(lck);
exit_server("push_deferred_open_message_smb failed");
}
if (lck) {
struct defer_open_state *watch_state;
struct tevent_req *watch_req;
@ -1614,6 +1609,12 @@ static void defer_open(struct share_mode_lock *lck,
timeval_sum(&request_time, &timeout));
SMB_ASSERT(ret);
}
if (!push_deferred_open_message_smb(req, request_time, timeout,
state->id, open_rec)) {
TALLOC_FREE(lck);
exit_server("push_deferred_open_message_smb failed");
}
}
static void defer_open_done(struct tevent_req *req)