Recent changes (master)

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The following changes since commit abcab6afc18464b8fee0830914398880995cbffe:

  HOWTO: Fix description of grouping behavior with numjobs (2012-10-05 13:34:40 +0200)

are available in the git repository at:
  git://git.kernel.dk/fio.git master

Jens Axboe (1):
      Fix confusion between terse and json output

 diskutil.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

---

Diff of recent changes:

diff --git a/diskutil.c b/diskutil.c
index d98e39a..fbc4268 100644
--- a/diskutil.c
+++ b/diskutil.c
@@ -658,7 +658,7 @@ void show_disk_util(int terse, struct json_object *parent)
 	if (!terse)
 		log_info("\nDisk stats (read/write):\n");
 
-	if (terse && terse_version == 4) {
+	if (output_format == FIO_OUTPUT_JSON) {
 		array = json_create_array();
 		json_object_add_value_array(parent, "disk_util", array);
 	}
@@ -667,7 +667,7 @@ void show_disk_util(int terse, struct json_object *parent)
 		du = flist_entry(entry, struct disk_util, list);
 
 		aggregate_slaves_stats(du);
-		if (terse && terse_version == 4)
+		if (output_format == FIO_OUTPUT_JSON)
 			print_disk_util_json(du, array);
 		else
 			print_disk_util(&du->dus, &du->agg, terse);
--
To unsubscribe from this list: send the line "unsubscribe fio" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Linux Kernel]     [Linux SCSI]     [Linux IDE]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite News]     [Linux SCSI]

  Powered by Linux