From 9edf7b3ed581a61433ad620d457b4d0349115e52 Mon Sep 17 00:00:00 2001 From: Jens Axboe Date: Mon, 14 Apr 2014 13:19:13 -0600 Subject: [PATCH] diskutil: make it clear that parent != NULL for json output Signed-off-by: Jens Axboe --- diskutil.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/diskutil.c b/diskutil.c index d97c5ca1..3ee5c6c8 100644 --- a/diskutil.c +++ b/diskutil.c @@ -6,6 +6,7 @@ #include #include #include +#include #include "fio.h" #include "smalloc.h" @@ -686,12 +687,15 @@ void show_disk_util(int terse, struct json_object *parent) return; } - if (!terse && !parent) + if (output_format == FIO_OUTPUT_JSON) + assert(parent); + + if (!terse && output_format != FIO_OUTPUT_JSON) log_info("\nDisk stats (read/write):\n"); - if (output_format == FIO_OUTPUT_JSON) { + if (output_format == FIO_OUTPUT_JSON) json_object_add_disk_utils(parent, &disk_list); - } else + else flist_for_each(entry, &disk_list) { du = flist_entry(entry, struct disk_util, list); -- 2.25.1