From 404eee1417dad8abe6ef49ea6e1469fe6cfdddbe Mon Sep 17 00:00:00 2001 From: Sebastien GODARD Date: Sun, 24 Nov 2019 08:55:40 +0100 Subject: [PATCH] iostat: Fix wrong unit used in JSON output The values for the amount of data read/written or discarded were always expressed in blocks/s in the JSON output generated by iostat. It should take into account the unit (blocks, kB, MB) selected by the user. Signed-off-by: Sebastien GODARD --- iostat.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/iostat.c b/iostat.c index 5aa7a06..41a1dbd 100644 --- a/iostat.c +++ b/iostat.c @@ -857,11 +857,6 @@ void write_disk_stat_header(int *fctr, int *tab, int hpart) { char *units, *spc; - if (DISPLAY_JSON_OUTPUT(flags)) { - xprintf((*tab)++, "\"disk\": ["); - return; - } - if (DISPLAY_KILOBYTES(flags)) { *fctr = 2; units = "kB"; @@ -881,6 +876,11 @@ void write_disk_stat_header(int *fctr, int *tab, int hpart) spc = ""; } + if (DISPLAY_JSON_OUTPUT(flags)) { + xprintf((*tab)++, "\"disk\": ["); + return; + } + if (!DISPLAY_HUMAN_READ(flags)) { printf("Device "); } -- 2.40.0