s4:torture - partially revert "s4:torture - prefer the termination "return"s at the...

This partially reverts commit 54a5c398aaa1d53b5892c9b0aa5539ae7da651da.
As tridge pointed out I've overseen the nested loop in "run_iometer".
Therefore we end in a infinite loop. Obviously it wasn't run by "make
test" since then I would have detected it.

Autobuild-User: Matthias Dieter Wallnöfer <mdw@samba.org>
Autobuild-Date: Tue Nov 30 09:23:00 CET 2010 on sn-devel-104

diff --git a/source4/torture/basic/base.c b/source4/torture/basic/base.c
index 0e168ed95b52f44cb01270c1f9fa7a95fe2c21be..995357302ba713aa271f308c48c15f073f286c56 100644 (file)
--- a/source4/torture/basic/base.c
+++ b/source4/torture/basic/base.c
@@ -1340,7 +1340,7 @@ static bool run_iometer(struct torture_context *tctx,
                for (i=0; i<num_reads; i++) {
                        ssize_t res;
                        if (ops++ > torture_numops) {
-                               break;
+                               return true;
                        }
                        res = smbcli_read(cli->tree, fnum, buf,
                                          random() % filesize, sizeof(buf));
@@ -1351,7 +1351,7 @@ static bool run_iometer(struct torture_context *tctx,
                for (i=0; i<num_writes; i++) {
                        ssize_t res;
                        if (ops++ > torture_numops) {
-                               break;
+                               return true;
                        }
                        res = smbcli_write(cli->tree, fnum, 0, buf,
                                          random() % filesize, sizeof(buf));
@@ -1360,8 +1360,6 @@ static bool run_iometer(struct torture_context *tctx,
                                       smbcli_errstr(cli->tree)));
                }
        }
-
-       return true;
 }
 
 /**