diskutil: fix segfault for both json and terse output

Signed-off-by: Jens Axboe <axboe@fb.com>

diff --git a/diskutil.c b/diskutil.c
index c3181b5bcd1f87bbe194892717852f1e9df0e6fb..074f1307d32212421f20833a8c73ee01b97fc5ab 100644 (file)
--- a/diskutil.c
+++ b/diskutil.c
@@ -695,6 +695,7 @@ void show_disk_util(int terse, struct json_object *parent,
 {
        struct flist_head *entry;
        struct disk_util *du;
 {
        struct flist_head *entry;
        struct disk_util *du;

+       bool do_json;

 
        if (!disk_util_mutex)
                return;
 
        if (!disk_util_mutex)
                return;


@@ -706,13 +707,15 @@ void show_disk_util(int terse, struct json_object *parent,
                return;
        }
 
                return;
        }
 

-       if (output_format & FIO_OUTPUT_JSON)
-               assert(parent);
+       if ((output_format & FIO_OUTPUT_JSON) && parent)
+               do_json = true;
+       else
+               do_json = false;

 
 

-       if (!terse && !(output_format & FIO_OUTPUT_JSON))
+       if (!terse && !do_json)

                log_buf(out, "\nDisk stats (read/write):\n");
 
                log_buf(out, "\nDisk stats (read/write):\n");
 

-       if (output_format & FIO_OUTPUT_JSON)
+       if (do_json)

                json_object_add_disk_utils(parent, &disk_list);
        if (output_format & ~(FIO_OUTPUT_JSON | FIO_OUTPUT_JSON_PLUS)) {
                flist_for_each(entry, &disk_list) {
                json_object_add_disk_utils(parent, &disk_list);
        if (output_format & ~(FIO_OUTPUT_JSON | FIO_OUTPUT_JSON_PLUS)) {
                flist_for_each(entry, &disk_list) {