From 236d24dff4826a469d2e980c2b71c2adba3b907e Mon Sep 17 00:00:00 2001 From: Vincent Fu Date: Wed, 11 Nov 2015 11:26:37 -0700 Subject: [PATCH] json output fixups - diskutil json+ fixup - idletime missed a conversion for the multiple output formats Signed-off-by: Jens Axboe --- diskutil.c | 2 +- idletime.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/diskutil.c b/diskutil.c index f83fc475..c3181b5b 100644 --- a/diskutil.c +++ b/diskutil.c @@ -714,7 +714,7 @@ void show_disk_util(int terse, struct json_object *parent, if (output_format & FIO_OUTPUT_JSON) json_object_add_disk_utils(parent, &disk_list); - if (output_format & ~(FIO_OUTPUT_JSON)) { + if (output_format & ~(FIO_OUTPUT_JSON | FIO_OUTPUT_JSON_PLUS)) { flist_for_each(entry, &disk_list) { du = flist_entry(entry, struct disk_util, list); diff --git a/idletime.c b/idletime.c index 5cc8b65f..fab43c53 100644 --- a/idletime.c +++ b/idletime.c @@ -481,7 +481,7 @@ void show_idle_prof_stats(int output, struct json_object *parent, return; } - if ((ipc.opt != IDLE_PROF_OPT_NONE) && (output == FIO_OUTPUT_JSON)) { + if ((ipc.opt != IDLE_PROF_OPT_NONE) && (output & FIO_OUTPUT_JSON)) { if (!parent) return; -- 2.25.1