summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Bokovoy <ab@samba.org>2007-06-17 16:46:44 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:53:24 -0500
commitde4f15a3ad0efaa02787839f29496abe9f5d5e80 (patch)
tree820d2201dde5ed5d8499a150332c88323928dbef
parentf9a3774254861e4d3c0cb8e0091d7ab315236439 (diff)
downloadsamba-de4f15a3ad0efaa02787839f29496abe9f5d5e80.tar.gz
samba-de4f15a3ad0efaa02787839f29496abe9f5d5e80.tar.bz2
samba-de4f15a3ad0efaa02787839f29496abe9f5d5e80.zip
r23529: When using READX, fill in readx fields. Thanks to Metze for spotting it.
(This used to be commit 9bb079d70d3fab3ad66143301e8ddfbb5135dedb)
-rw-r--r--source4/torture/basic/misc.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/source4/torture/basic/misc.c b/source4/torture/basic/misc.c
index 12eec9d551..7a2aad0e75 100644
--- a/source4/torture/basic/misc.c
+++ b/source4/torture/basic/misc.c
@@ -575,13 +575,14 @@ static NTSTATUS benchrw_readwrite(struct torture_context *tctx,
"Callback READ file:%d (%d/%d) Offset:%d\n",
state->nr,state->completed,torture_numops,
(state->readcnt*state->lp_params->blocksize));
- rd.generic.level = RAW_READ_READ;
- rd.read.in.file.fnum = state->fnum ;
- rd.read.in.offset = state->readcnt *
+ rd.generic.level = RAW_READ_READX;
+ rd.readx.in.file.fnum = state->fnum ;
+ rd.readx.in.offset = state->readcnt *
state->lp_params->blocksize;
- rd.read.in.count = state->lp_params->blocksize;
- rd.read.in.remaining = 0 ;
- rd.read.out.data = state->buffer;
+ rd.readx.in.mincnt = state->lp_params->blocksize;
+ rd.readx.in.maxcnt = rd.readx.in.mincnt;
+ rd.readx.in.remaining = 0 ;
+ rd.readx.out.data = state->buffer;
if(state->readcnt < state->lp_params->writeblocks){
state->readcnt++;
}else{