Recent changes (master)

Jens Axboe
2020-09-10T12:00:50Z

The following changes since commit ca8ff0968cec7ee47ca7fe5b40f592c2b332b062:

Merge branch 'zbd' of https://github.com/bvanassche/fio into master (2020-09-08 10:25:48 -0600)

are available in the Git repository at:

git://git.kernel.dk/fio.git master

for you to fetch changes up to e55138eed3296b642229271b0dcec492ec776702:

Merge branch 'evelu-enghelp' of https://github.com/ErwanAliasr1/fio into master (2020-09-09 10:48:27 -0600)

----------------------------------------------------------------
Erwan Velu (1):
init: exiting with fio_show_ioengine_help return code

Jens Axboe (1):
Merge branch 'evelu-enghelp' of https://github.com/ErwanAliasr1/fio into master

init.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

---

Diff of recent changes:

diff --git a/init.c b/init.c
index 3cd0238b..7f64ce21 100644
--- a/init.c
+++ b/init.c
@@ -2543,7 +2543,7 @@ int parse_cmd_line(int argc, char *argv[], int client_type)
case 'i':
did_arg = true;
if (!cur_client) {
- fio_show_ioengine_help(optarg);
+ exit_val = fio_show_ioengine_help(optarg);
do_exit++;
}
break;