diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-04-16 23:06:27 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-04-16 23:06:27 +0200 |
| commit | 4b9c7df9b7465a360e7a528a116ed3740447b7be (patch) | |
| tree | c5b0cc64e340777511ecac569b793ef24b8615b1 | |
| parent | a195cd9d8f3d0c0185fbf82388bd1efaa63e7bd5 (diff) | |
| download | samba-4b9c7df9b7465a360e7a528a116ed3740447b7be.tar.gz samba-4b9c7df9b7465a360e7a528a116ed3740447b7be.tar.bz2 samba-4b9c7df9b7465a360e7a528a116ed3740447b7be.zip | |
Avoid event_find_context when a event context is already available.
(This used to be commit 4ca264679ecfd938c538a93f4efff1bfa23c3744)
| -rw-r--r-- | source4/torture/raw/oplock.c | 3 | ||||
| -rw-r--r-- | source4/torture/smb2/scan.c | 4 | ||||
| -rw-r--r-- | source4/torture/smb2/util.c | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/source4/torture/raw/oplock.c b/source4/torture/raw/oplock.c index 1927a0f027..fd8d292980 100644 --- a/source4/torture/raw/oplock.c +++ b/source4/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/source4/torture/smb2/scan.c b/source4/torture/smb2/scan.c index 0f4c9fefdf..889d343a49 100644 --- a/source4/torture/smb2/scan.c +++ b/source4/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/source4/torture/smb2/util.c b/source4/torture/smb2/util.c index f85b1c42ff..6ac3926c98 100644 --- a/source4/torture/smb2/util.c +++ b/source4/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)); |