From d711cce53d5c00233e86802eb58c219c50b8d3ab Mon Sep 17 00:00:00 2001 From: Jens Axboe Date: Sat, 27 Sep 2014 08:08:00 -0600 Subject: [PATCH] parse: fix issue with not filling leftover percentages correctly Signed-off-by: Jens Axboe --- options.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/options.c b/options.c index 593f7171..56e9108a 100644 --- a/options.c +++ b/options.c @@ -98,9 +98,9 @@ static int bssplit_ddir(struct thread_options *o, int ddir, char *str) if (perc > 100) perc = 100; else if (!perc) - perc = -1; + perc = -1U; } else - perc = -1; + perc = -1U; if (str_to_decimal(fname, &val, 1, o, 0)) { log_err("fio: bssplit conversion failed\n"); @@ -127,7 +127,7 @@ static int bssplit_ddir(struct thread_options *o, int ddir, char *str) for (i = 0; i < o->bssplit_nr[ddir]; i++) { struct bssplit *bsp = &bssplit[i]; - if (bsp->perc == (unsigned char) -1) + if (bsp->perc == -1U) perc_missing++; else perc += bsp->perc; @@ -138,17 +138,18 @@ static int bssplit_ddir(struct thread_options *o, int ddir, char *str) free(bssplit); return 1; } + /* * If values didn't have a percentage set, divide the remains between * them. */ if (perc_missing) { - if (perc_missing == 1) + if (perc_missing == 1 && o->bssplit_nr[ddir] == 1) perc = 100; for (i = 0; i < o->bssplit_nr[ddir]; i++) { struct bssplit *bsp = &bssplit[i]; - if (bsp->perc == (unsigned char) -1) + if (bsp->perc == -1U) bsp->perc = (100 - perc) / perc_missing; } } -- 2.25.1