r23540: Continue fixing bench-readwrite. We need to initialize state->readcnt not...

(This used to be commit 0258f9d3c21d1f9ce6bfcf31138d7f8b9bfb6b7d)

diff --git a/source4/torture/basic/misc.c b/source4/torture/basic/misc.c
index 7a2aad0e752ea4da9478a32be867ebaf452128b3..e611ddcc32393668315cb1d5d606f64e5792e61d 100644 (file)
--- a/source4/torture/basic/misc.c
+++ b/source4/torture/basic/misc.c
@@ -577,12 +577,12 @@ static NTSTATUS benchrw_readwrite(struct torture_context *tctx,
                                (state->readcnt*state->lp_params->blocksize));
                rd.generic.level = RAW_READ_READX;
                rd.readx.in.file.fnum   = state->fnum   ;
-               rd.readx.in.offset      = state->readcnt * 
-                                       state->lp_params->blocksize;
+               rd.readx.in.offset      = state->readcnt*state->lp_params->blocksize; 
                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;
+               rd.readx.in.read_for_execute = False;
                if(state->readcnt < state->lp_params->writeblocks){
                        state->readcnt++;       
                }else{
@@ -727,6 +727,7 @@ static void benchrw_callback(struct smbcli_request *req)
                                        "file - %s\n", 
                                        nt_errstr(req->status));
                        state->mode=ERROR;
+                       state->readcnt=0;
                        return;
                }
                break;