From 88dd90d9288e49c33f4e8d528bf109a40fc997d8 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Mon, 14 Nov 2011 15:42:55 +0100 Subject: [PATCH] s3:smb2_server: pass explicit defer_times to smbd_smb2_request_pending_queue() metze --- source3/smbd/globals.h | 3 ++- source3/smbd/smb2_break.c | 2 +- source3/smbd/smb2_create.c | 2 +- source3/smbd/smb2_find.c | 2 +- source3/smbd/smb2_flush.c | 2 +- source3/smbd/smb2_getinfo.c | 2 +- source3/smbd/smb2_ioctl.c | 2 +- source3/smbd/smb2_lock.c | 2 +- source3/smbd/smb2_notify.c | 2 +- source3/smbd/smb2_read.c | 2 +- source3/smbd/smb2_server.c | 4 ++-- source3/smbd/smb2_setinfo.c | 2 +- source3/smbd/smb2_write.c | 2 +- 13 files changed, 15 insertions(+), 14 deletions(-) diff --git a/source3/smbd/globals.h b/source3/smbd/globals.h index 77eed19289b..a02988a47d1 100644 --- a/source3/smbd/globals.h +++ b/source3/smbd/globals.h @@ -259,7 +259,8 @@ NTSTATUS smbd_smb2_send_oplock_break(struct smbd_server_connection *sconn, uint8_t oplock_level); NTSTATUS smbd_smb2_request_pending_queue(struct smbd_smb2_request *req, - struct tevent_req *subreq); + struct tevent_req *subreq, + uint32_t defer_time); struct smb_request *smbd_smb2_fake_smb_request(struct smbd_smb2_request *req); void remove_smb2_chained_fsp(files_struct *fsp); diff --git a/source3/smbd/smb2_break.c b/source3/smbd/smb2_break.c index ce583acca3b..9899d92602a 100644 --- a/source3/smbd/smb2_break.c +++ b/source3/smbd/smb2_break.c @@ -78,7 +78,7 @@ NTSTATUS smbd_smb2_request_process_break(struct smbd_smb2_request *req) } tevent_req_set_callback(subreq, smbd_smb2_request_oplock_break_done, req); - return smbd_smb2_request_pending_queue(req, subreq); + return smbd_smb2_request_pending_queue(req, subreq, 500); } static void smbd_smb2_request_oplock_break_done(struct tevent_req *subreq) diff --git a/source3/smbd/smb2_create.c b/source3/smbd/smb2_create.c index eee252ba36e..fb7ec291ce4 100644 --- a/source3/smbd/smb2_create.c +++ b/source3/smbd/smb2_create.c @@ -244,7 +244,7 @@ NTSTATUS smbd_smb2_request_process_create(struct smbd_smb2_request *smb2req) } tevent_req_set_callback(tsubreq, smbd_smb2_request_create_done, smb2req); - return smbd_smb2_request_pending_queue(smb2req, tsubreq); + return smbd_smb2_request_pending_queue(smb2req, tsubreq, 500); } static uint64_t get_mid_from_smb2req(struct smbd_smb2_request *smb2req) diff --git a/source3/smbd/smb2_find.c b/source3/smbd/smb2_find.c index 6369e7fdbec..9b1179f1f6f 100644 --- a/source3/smbd/smb2_find.c +++ b/source3/smbd/smb2_find.c @@ -135,7 +135,7 @@ NTSTATUS smbd_smb2_request_process_find(struct smbd_smb2_request *req) } tevent_req_set_callback(subreq, smbd_smb2_request_find_done, req); - return smbd_smb2_request_pending_queue(req, subreq); + return smbd_smb2_request_pending_queue(req, subreq, 500); } static void smbd_smb2_request_find_done(struct tevent_req *subreq) diff --git a/source3/smbd/smb2_flush.c b/source3/smbd/smb2_flush.c index 5f3c42a9d8b..3464c58ca6b 100644 --- a/source3/smbd/smb2_flush.c +++ b/source3/smbd/smb2_flush.c @@ -64,7 +64,7 @@ NTSTATUS smbd_smb2_request_process_flush(struct smbd_smb2_request *req) } tevent_req_set_callback(subreq, smbd_smb2_request_flush_done, req); - return smbd_smb2_request_pending_queue(req, subreq); + return smbd_smb2_request_pending_queue(req, subreq, 500); } static void smbd_smb2_request_flush_done(struct tevent_req *subreq) diff --git a/source3/smbd/smb2_getinfo.c b/source3/smbd/smb2_getinfo.c index c5d2d62cd9b..81d781a49ad 100644 --- a/source3/smbd/smb2_getinfo.c +++ b/source3/smbd/smb2_getinfo.c @@ -118,7 +118,7 @@ NTSTATUS smbd_smb2_request_process_getinfo(struct smbd_smb2_request *req) } tevent_req_set_callback(subreq, smbd_smb2_request_getinfo_done, req); - return smbd_smb2_request_pending_queue(req, subreq); + return smbd_smb2_request_pending_queue(req, subreq, 500); } static void smbd_smb2_request_getinfo_done(struct tevent_req *subreq) diff --git a/source3/smbd/smb2_ioctl.c b/source3/smbd/smb2_ioctl.c index 5a766e1b1a5..6162096f336 100644 --- a/source3/smbd/smb2_ioctl.c +++ b/source3/smbd/smb2_ioctl.c @@ -110,7 +110,7 @@ NTSTATUS smbd_smb2_request_process_ioctl(struct smbd_smb2_request *req) } tevent_req_set_callback(subreq, smbd_smb2_request_ioctl_done, req); - return smbd_smb2_request_pending_queue(req, subreq); + return smbd_smb2_request_pending_queue(req, subreq, 500); } static void smbd_smb2_request_ioctl_done(struct tevent_req *subreq) diff --git a/source3/smbd/smb2_lock.c b/source3/smbd/smb2_lock.c index ed1d688cfc5..4f88bb832bd 100644 --- a/source3/smbd/smb2_lock.c +++ b/source3/smbd/smb2_lock.c @@ -133,7 +133,7 @@ NTSTATUS smbd_smb2_request_process_lock(struct smbd_smb2_request *req) } tevent_req_set_callback(subreq, smbd_smb2_request_lock_done, req); - return smbd_smb2_request_pending_queue(req, subreq); + return smbd_smb2_request_pending_queue(req, subreq, 500); } static void smbd_smb2_request_lock_done(struct tevent_req *subreq) diff --git a/source3/smbd/smb2_notify.c b/source3/smbd/smb2_notify.c index 49c6a544972..5375e214566 100644 --- a/source3/smbd/smb2_notify.c +++ b/source3/smbd/smb2_notify.c @@ -95,7 +95,7 @@ NTSTATUS smbd_smb2_request_process_notify(struct smbd_smb2_request *req) } tevent_req_set_callback(subreq, smbd_smb2_request_notify_done, req); - return smbd_smb2_request_pending_queue(req, subreq); + return smbd_smb2_request_pending_queue(req, subreq, 500); } static void smbd_smb2_request_notify_done(struct tevent_req *subreq) diff --git a/source3/smbd/smb2_read.c b/source3/smbd/smb2_read.c index 75494373c64..c3cbbe8084c 100644 --- a/source3/smbd/smb2_read.c +++ b/source3/smbd/smb2_read.c @@ -100,7 +100,7 @@ NTSTATUS smbd_smb2_request_process_read(struct smbd_smb2_request *req) } tevent_req_set_callback(subreq, smbd_smb2_request_read_done, req); - return smbd_smb2_request_pending_queue(req, subreq); + return smbd_smb2_request_pending_queue(req, subreq, 500); } static void smbd_smb2_request_read_done(struct tevent_req *subreq) diff --git a/source3/smbd/smb2_server.c b/source3/smbd/smb2_server.c index 01269c927dd..dbb0089d70a 100644 --- a/source3/smbd/smb2_server.c +++ b/source3/smbd/smb2_server.c @@ -841,11 +841,11 @@ static void smbd_smb2_request_pending_timer(struct tevent_context *ev, void *private_data); NTSTATUS smbd_smb2_request_pending_queue(struct smbd_smb2_request *req, - struct tevent_req *subreq) + struct tevent_req *subreq, + uint32_t defer_time) { NTSTATUS status; int i = req->current_idx; - uint32_t defer_time = 500; struct timeval defer_endtime; uint8_t *outhdr = NULL; uint32_t flags; diff --git a/source3/smbd/smb2_setinfo.c b/source3/smbd/smb2_setinfo.c index 751190ac626..1aae3525077 100644 --- a/source3/smbd/smb2_setinfo.c +++ b/source3/smbd/smb2_setinfo.c @@ -104,7 +104,7 @@ NTSTATUS smbd_smb2_request_process_setinfo(struct smbd_smb2_request *req) } tevent_req_set_callback(subreq, smbd_smb2_request_setinfo_done, req); - return smbd_smb2_request_pending_queue(req, subreq); + return smbd_smb2_request_pending_queue(req, subreq, 500); } static void smbd_smb2_request_setinfo_done(struct tevent_req *subreq) diff --git a/source3/smbd/smb2_write.c b/source3/smbd/smb2_write.c index 0ddb0b1ef0d..34272056ed0 100644 --- a/source3/smbd/smb2_write.c +++ b/source3/smbd/smb2_write.c @@ -107,7 +107,7 @@ NTSTATUS smbd_smb2_request_process_write(struct smbd_smb2_request *req) } tevent_req_set_callback(subreq, smbd_smb2_request_write_done, req); - return smbd_smb2_request_pending_queue(req, subreq); + return smbd_smb2_request_pending_queue(req, subreq, 500); } static void smbd_smb2_request_write_done(struct tevent_req *subreq) -- 2.11.4.GIT