sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-08 05:57:51 +03:00
Code

smbd: Pass in "struct smb_request" to request_timed_out()

Browse Source 
It seems more natural to pass in a request to a routine called
request_timed_out(), and it's a few bytes less .text

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
This commit is contained in:
Volker Lendecke 2019-08-01 17:00:45 +02:00 committed by Jeremy Allison
parent bb81b9a75a
commit 3ca52f11dc
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
source3/smbd/open.c
View File

@ -2369,12 +2369,11 @@ static NTSTATUS grant_fsp_oplock_type(struct smb_request *req,
return NT_STATUS_OK; return NT_STATUS_OK;
} }
static bool request_timed_out(struct timeval request_time, static bool request_timed_out(struct smb_request *req, struct timeval timeout)
struct timeval timeout)
{ {
struct timeval now, end_time; struct timeval now, end_time;
GetTimeOfDay(&now); GetTimeOfDay(&now);
end_time = timeval_sum(&request_time, &timeout); end_time = timeval_sum(&req->request_time, &timeout);
return (timeval_compare(&end_time, &now) < 0); return (timeval_compare(&end_time, &now) < 0);
} }
@ -2534,7 +2533,7 @@ static void setup_kernel_oplock_poll_open(struct smb_request *req,
/* Maximum wait time. */ /* Maximum wait time. */
struct timeval timeout = timeval_set(OPLOCK_BREAK_TIMEOUT*2, 0); struct timeval timeout = timeval_set(OPLOCK_BREAK_TIMEOUT*2, 0);
if (request_timed_out(req->request_time, timeout)) { if (request_timed_out(req, timeout)) {
return; return;
} }
@ -2632,7 +2631,7 @@ static void schedule_defer_open(struct share_mode_lock *lck,
timeout = timeval_set(OPLOCK_BREAK_TIMEOUT*2, 0); timeout = timeval_set(OPLOCK_BREAK_TIMEOUT*2, 0);
if (request_timed_out(req->request_time, timeout)) { if (request_timed_out(req, timeout)) {
return; return;
} }
@ -2657,7 +2656,7 @@ static void schedule_async_open(struct smb_request *req)
struct timeval timeout = timeval_set(20, 0); struct timeval timeout = timeval_set(20, 0);
bool ok; bool ok;
if (request_timed_out(req->request_time, timeout)) { if (request_timed_out(req, timeout)) {
return; return;
} }
@ -3530,7 +3529,7 @@ static NTSTATUS open_file_ntcreate(connection_struct *conn,
timeout = timeval_set(0, timeout_usecs); timeout = timeval_set(0, timeout_usecs);
if (!request_timed_out(req->request_time, timeout)) { if (!request_timed_out(req, timeout)) {
defer_open(lck, timeout, req, false, id); defer_open(lck, timeout, req, false, id);
} }
} }