s3:smb2_server: pass explicit defer_times to smbd_smb2_request_pending_queue()

metze

diff --git a/source3/smbd/globals.h b/source3/smbd/globals.h
index 77eed19289b10eeafca35002ee22a178bb52e616..a02988a47d1cd9524160cca631e7f5b980d5511f 100644 (file)
--- 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 ce583acca3b5a812ff256302815285052762b7f8..9899d92602aa67b4a60743edada8f677ab0fa6c8 100644 (file)
--- 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 eee252ba36eee15f22e7987f71ef26845d96e6ea..fb7ec291ce454f56f19c147addaa1adf145275d9 100644 (file)
--- 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 6369e7fdbece01087c0169c7a492b989255cde5c..9b1179f1f6f6980f4067a71cafcd5fed16fc7cc5 100644 (file)
--- 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 5f3c42a9d8ba4549b47a4060da6dd2ee5e7a9b2e..3464c58ca6bbb6a59f6223be46551ab9040bd870 100644 (file)
--- 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 c5d2d62cd9b8d27f0b0f620d3ec4947214183950..81d781a49ade129d6c11d5bf4eaae60b25fad4ae 100644 (file)
--- 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 5a766e1b1a52acfaca10ddad3520881339274de0..6162096f336a50d8f27bd0d3fe150542815e8c1b 100644 (file)
--- 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 ed1d688cfc59d8a00dd4906471174e3642502bb0..4f88bb832bdd637f6d18c09999258627765c96ea 100644 (file)
--- 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 49c6a5449722484d562d53d3f23d7a5a27cff232..5375e214566d702c8fd413bc2244427cc558f213 100644 (file)
--- 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 75494373c64c9c6298ce777484ac9d2003ba4f3e..c3cbbe8084ca66668d28bd9cd18d6f593f25a206 100644 (file)
--- 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 01269c927ddb1cdacbba5562ab273ac2476c61b0..dbb0089d70a40a4e36a9cf44bda856874491ca81 100644 (file)
--- 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 751190ac626e4c2b1263084e7a0b6465bc73d1f7..1aae3525077c33e7ba1f382d123885fdab31f636 100644 (file)
--- 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 0ddb0b1ef0d9f52f0a293993d2ed25bbcfc4e221..34272056ed0b0671ef24f2f3f4db92316abb5eff 100644 (file)
--- 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)