From 7fa2f1159437c9f1aa47f51e65655b4d9afa5c0a Mon Sep 17 00:00:00 2001 From: Ralph Boehme Date: Tue, 7 Mar 2017 19:11:20 +0100 Subject: [PATCH] s3/smbd: remove async_open arg from defer_open() All remaining callers pass false. Bug: https://bugzilla.samba.org/show_bug.cgi?id=7537 Signed-off-by: Ralph Boehme Reviewed-by: Jeremy Allison --- source3/smbd/open.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/source3/smbd/open.c b/source3/smbd/open.c index ef0250e36bb..0fb82fe3d8a 100644 --- a/source3/smbd/open.c +++ b/source3/smbd/open.c @@ -1976,7 +1976,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; @@ -1985,16 +1984,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); @@ -2236,7 +2234,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); } /**************************************************************************** @@ -3159,7 +3157,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); } } -- 2.11.4.GIT