diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2009-02-05 16:39:28 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2009-02-05 16:39:28 +0100 |
| commit | 6d139ca4680abcbda5110f2f0886aa038ff62088 (patch) | |
| tree | 7d61db40fb058bcbf08ccd8e0dadc365b819371b /source4/torture/basic/misc.c | |
| parent | 4a9b3052caeb8bb144803b49dcfae82395172bc3 (diff) | |
| parent | afa960cbbcd609123d710c301e7a9a070c1fed70 (diff) | |
| download | samba-6d139ca4680abcbda5110f2f0886aa038ff62088.tar.gz samba-6d139ca4680abcbda5110f2f0886aa038ff62088.tar.bz2 samba-6d139ca4680abcbda5110f2f0886aa038ff62088.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Conflicts:
librpc/ndr.pc.in
Diffstat (limited to 'source4/torture/basic/misc.c')
| -rw-r--r-- | source4/torture/basic/misc.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/source4/torture/basic/misc.c b/source4/torture/basic/misc.c index 23844a2c85..f4f91c8ba3 100644 --- a/source4/torture/basic/misc.c +++ b/source4/torture/basic/misc.c @@ -510,7 +510,7 @@ static NTSTATUS benchrw_close(struct torture_context *tctx, NT_STATUS_HAVE_NO_MEMORY(req); /*register the callback function!*/ req->async.fn = benchrw_callback; - req->async.private = state; + req->async.private_data = state; return NT_STATUS_OK; } @@ -521,7 +521,7 @@ static void benchrw_callback(struct smbcli_request *req); static void benchrw_rw_callback(struct smbcli_request *req) { - struct benchrw_state *state = req->async.private; + struct benchrw_state *state = req->async.private_data; struct torture_context *tctx = state->tctx; if (!NT_STATUS_IS_OK(req->status)) { @@ -596,7 +596,7 @@ static NTSTATUS benchrw_readwrite(struct torture_context *tctx, NT_STATUS_HAVE_NO_MEMORY(req); /*register the callback function!*/ req->async.fn = benchrw_rw_callback; - req->async.private = state; + req->async.private_data = state; return NT_STATUS_OK; } @@ -644,7 +644,7 @@ static NTSTATUS benchrw_open(struct torture_context *tctx, /*register the callback function!*/ req->async.fn = benchrw_callback; - req->async.private = state; + req->async.private_data = state; return NT_STATUS_OK; } @@ -691,7 +691,7 @@ static NTSTATUS benchrw_mkdir(struct torture_context *tctx, /*register the callback function!*/ req->async.fn = benchrw_callback; - req->async.private = state; + req->async.private_data = state; return NT_STATUS_OK; } @@ -701,7 +701,7 @@ static NTSTATUS benchrw_mkdir(struct torture_context *tctx, */ static void benchrw_callback(struct smbcli_request *req) { - struct benchrw_state *state = req->async.private; + struct benchrw_state *state = req->async.private_data; struct torture_context *tctx = state->tctx; /*dont send new requests when torture_numops is reached*/ @@ -913,7 +913,7 @@ bool run_benchrw(struct torture_context *tctx) req = smb_raw_mkdir_send(state[i]->cli,&parms); /* register callback fn + private data */ req->async.fn = benchrw_callback; - req->async.private=state[i]; + req->async.private_data=state[i]; break; /* error occured , finish */ case ERROR: |