diff options
| author | Ralph Boehme <slow@samba.org> | 2017-03-07 19:11:20 +0100 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2017-03-14 12:49:24 +0100 |
| commit | 9bbccbb1d29298235744537cd6a68845b3f60e13 (patch) | |
| tree | c19ae7fd9b2360d8d05f610c0ecfd59d9befc9b8 | |
| parent | 5e94b38e14ea8090f904cc2d270ebdbb2f583e16 (diff) | |
| download | samba-9bbccbb1d29298235744537cd6a68845b3f60e13.tar.gz | |
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 <slow@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
(cherry picked from commit 7fa2f1159437c9f1aa47f51e65655b4d9afa5c0a)
| -rw-r--r-- | source3/smbd/open.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/source3/smbd/open.c b/source3/smbd/open.c index e76395d54e3..cfe91357777 100644 --- a/source3/smbd/open.c +++ b/source3/smbd/open.c @@ -1957,7 +1957,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; @@ -1966,16 +1965,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); @@ -2216,7 +2214,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); } /**************************************************************************** @@ -3140,7 +3138,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); } } |