svn commit: samba r23540 - in branches/SAMBA_4_0/source/torture/basic: .

[ab at samba.org]

Author: ab
Date: 2007-06-18 14:06:04 +0000 (Mon, 18 Jun 2007)
New Revision: 23540

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23540

Log:
Continue fixing bench-readwrite. We need to initialize state->readcnt not only when file is written but at initial write as well.
Modified:
   branches/SAMBA_4_0/source/torture/basic/misc.c


Changeset:
Modified: branches/SAMBA_4_0/source/torture/basic/misc.c
===================================================================
--- branches/SAMBA_4_0/source/torture/basic/misc.c	2007-06-18 13:59:09 UTC (rev 23539)
+++ branches/SAMBA_4_0/source/torture/basic/misc.c	2007-06-18 14:06:04 UTC (rev 23540)
@@ -577,12 +577,12 @@
 				(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 @@
 					"file - %s\n", 
 					nt_errstr(req->status));
 			state->mode=ERROR;
+			state->readcnt=0;
 			return;
 		}
 		break;