sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-24 10:50:22 +03:00
Code

s3/smbd: remove async_open arg from defer_open()

Browse Source 
All remaining callers pass false.

Bug: https://bugzilla.samba.org/show_bug.cgi?id=7537

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
(cherry picked from commit 7fa2f1159437c9f1aa47f51e65655b4d9afa5c0a)
This commit is contained in:
Ralph Boehme 2017-03-07 19:11:20 +01:00 committed by Karolin Seeger
parent dcde5b114d
commit eeed4ffd12
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source3/smbd/open.c
View File

@ -1975,7 +1975,6 @@ static void defer_open(struct share_mode_lock *lck,
struct timeval timeout,
struct smb_request *req,
bool delayed_for_oplocks,
bool async_open,
struct file_id id)
{
struct deferred_open_record *open_rec = NULL;
@ -1984,16 +1983,15 @@ static void defer_open(struct share_mode_lock *lck,
abs_timeout = timeval_sum(&request_time, &timeout);
DBG_DEBUG("request time [%s] timeout [%s] mid [%" PRIu64 "] "
"delayed_for_oplocks [%s] async_open [%s] file_id [%s]\n",
"delayed_for_oplocks [%s] file_id [%s]\n",
timeval_string(talloc_tos(), &request_time, false),
timeval_string(talloc_tos(), &abs_timeout, false),
req->mid,
delayed_for_oplocks ? "yes" : "no",
async_open ? "yes" : "no",
file_id_string_tos(&id));
open_rec = deferred_open_record_create(delayed_for_oplocks,
async_open,
false,
id);
if (open_rec == NULL) {
TALLOC_FREE(lck);
@ -2235,7 +2233,7 @@ static void schedule_defer_open(struct share_mode_lock *lck,
return;
}
defer_open(lck, request_time, timeout, req, true, false, id);
defer_open(lck, request_time, timeout, req, true, id);
}
/****************************************************************************
@ -3158,7 +3156,7 @@ static NTSTATUS open_file_ntcreate(connection_struct *conn,
if (!request_timed_out(request_time, timeout)) {
defer_open(lck, request_time, timeout, req,
false, false, id);
false, id);
}
}