The following changes since commit 941bda94c6b985a16999a22757e7174872682579:
Fix warning on platforms without disk util support (2013-04-12 16:19:03 +0200)
are available in the git repository at:
git://git.kernel.dk/fio.git master
Jens Axboe (2):
Revert change that set group_reporting to 1
filesetup: set TD_SETTING_UP runstate when laying out files
filesetup.c | 13 ++++++++++---
options.c | 1 -
2 files changed, 10 insertions(+), 4 deletions(-)
---
Diff of recent changes:
diff --git a/filesetup.c b/filesetup.c
index 9edcac1..37ea752 100644
--- a/filesetup.c
+++ b/filesetup.c
@@ -723,9 +723,13 @@ int setup_files(struct thread_data *td)
struct fio_file *f;
unsigned int i;
int err = 0, need_extend;
+ int old_state;
dprint(FD_FILE, "setup files\n");
+ old_state = td->runstate;
+ td_set_runstate(td, TD_SETTING_UP);
+
if (o->read_iolog_file)
goto done;
@@ -740,7 +744,7 @@ int setup_files(struct thread_data *td)
err = get_file_sizes(td);
if (err)
- return err;
+ goto err_out;
/*
* check sizes. if the files/devices do not exist and the size
@@ -765,7 +769,7 @@ int setup_files(struct thread_data *td)
!(o->nr_files && (o->file_size_low || o->file_size_high))) {
log_err("%s: you need to specify size=\n", o->name);
td_verror(td, EINVAL, "total_file_size");
- return 1;
+ goto err_out;
}
/*
@@ -866,7 +870,7 @@ int setup_files(struct thread_data *td)
}
if (err)
- return err;
+ goto err_out;
if (!o->zone_size)
o->zone_size = o->size;
@@ -882,9 +886,12 @@ done:
if (o->create_only)
td->done = 1;
+ td_set_runstate(td, old_state);
return 0;
err_offset:
log_err("%s: you need to specify valid offset=\n", o->name);
+err_out:
+ td_set_runstate(td, old_state);
return 1;
}
diff --git a/options.c b/options.c
index f5cab65..3b04ffa 100644
--- a/options.c
+++ b/options.c
@@ -2766,7 +2766,6 @@ struct fio_option fio_options[FIO_MAX_OPTS] = {
.type = FIO_OPT_BOOL,
.off1 = td_var_offset(group_reporting),
.help = "Do reporting on a per-group basis",
- .def = "1",
.category = FIO_OPT_C_STAT,
.group = FIO_OPT_G_INVALID,
},
--
To unsubscribe from this list: send the line "unsubscribe fio" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
