Avoid event_find_context when a event context is already available.

diff --git a/source/torture/raw/oplock.c b/source/torture/raw/oplock.c
index 1927a0f027df77b3697275faf3ce426ec78fb296..fd8d292980aa48c13eaf735440b1c7bfa31e2560 100644 (file)
--- a/source/torture/raw/oplock.c
+++ b/source/torture/raw/oplock.c
@@ -2841,13 +2841,12 @@ bool torture_bench_oplock(struct torture_context *torture)
        int timelimit = torture_setting_int(torture, "timelimit", 10);
        union smb_open io;
        struct timeval tv;
-       struct event_context *ev = event_context_find(mem_ctx);
 
        cli = talloc_array(mem_ctx, struct smbcli_state *, torture_nprocs);
 
        torture_comment(torture, "Opening %d connections\n", torture_nprocs);
        for (i=0;i<torture_nprocs;i++) {
-               if (!torture_open_connection_ev(&cli[i], i, torture, ev)) {
+               if (!torture_open_connection_ev(&cli[i], i, torture, torture->ev)) {
                        return false;
                }
                talloc_steal(mem_ctx, cli[i]);

diff --git a/source/torture/smb2/scan.c b/source/torture/smb2/scan.c
index 0f4c9fefdfea60d51d6ca59e38cf2653999de06e..889d343a497ebe0b3c6c5e3804f8b276563a2617 100644 (file)
--- a/source/torture/smb2/scan.c
+++ b/source/torture/smb2/scan.c
@@ -207,7 +207,7 @@ bool torture_smb2_scan(struct torture_context *torture)
        status = smb2_connect(mem_ctx, host, share, 
                              lp_resolve_context(torture->lp_ctx), 
                              credentials, &tree, 
-                             event_context_find(mem_ctx));
+                             torture->ev);
        if (!NT_STATUS_IS_OK(status)) {
                printf("Connection failed - %s\n", nt_errstr(status));
                return false;
@@ -224,7 +224,7 @@ bool torture_smb2_scan(struct torture_context *torture)
                        status = smb2_connect(mem_ctx, host, share, 
                                              lp_resolve_context(torture->lp_ctx), 
                                              credentials, &tree, 
-                                             event_context_find(mem_ctx));
+                                             torture->ev);
                        if (!NT_STATUS_IS_OK(status)) {
                                printf("Connection failed - %s\n", nt_errstr(status));
                                return false;

diff --git a/source/torture/smb2/util.c b/source/torture/smb2/util.c
index f85b1c42ff9c56f6f6133463ceb96fcb8bdff10f..6ac3926c9883ce9b07ab8114798fa13f140aa030 100644 (file)
--- a/source/torture/smb2/util.c
+++ b/source/torture/smb2/util.c
@@ -314,7 +314,7 @@ bool torture_smb2_connection(struct torture_context *tctx, struct smb2_tree **tr
        status = smb2_connect(tctx, host, share, 
                              lp_resolve_context(tctx->lp_ctx),
                              credentials, tree, 
-                             event_context_find(tctx));
+                             tctx->ev);
        if (!NT_STATUS_IS_OK(status)) {
                printf("Failed to connect to SMB2 share \\\\%s\\%s - %s\n",
                       host, share, nt_errstr(status));