From: Tomohiro Kusumi <tkusumi@tuxera.com>
Date: Tue, 14 Feb 2017 15:19:44 +0000 (+0200)
Subject: Drop conditional declaration of disk_list
X-Git-Tag: fio-2.18~18
X-Git-Url: https://git.kernel.dk/?p=fio.git;a=commitdiff_plain;h=aa7d1aa6982189226ef19993dd4178979068be09

Drop conditional declaration of disk_list

disk_list is used unconditionally whether it's Linux or not,
so leave the one in libfio.c, and remove the one in diskutil.c.

Signed-off-by: Tomohiro Kusumi <tkusumi@tuxera.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
---

diff --git a/diskutil.c b/diskutil.c
index c3bcec92..dca37483 100644
--- a/diskutil.c
+++ b/diskutil.c
@@ -18,8 +18,6 @@ static struct disk_util *last_du;
 
 static struct fio_mutex *disk_util_mutex;
 
-FLIST_HEAD(disk_list);
-
 static struct disk_util *__init_per_file_disk_util(struct thread_data *td,
 		int majdev, int mindev, char *path);
 
diff --git a/libfio.c b/libfio.c
index 7e0d32c3..4b53c92a 100644
--- a/libfio.c
+++ b/libfio.c
@@ -36,12 +36,7 @@
 #include "helper_thread.h"
 #include "filehash.h"
 
-/*
- * Just expose an empty list, if the OS does not support disk util stats
- */
-#ifndef FIO_HAVE_DISK_UTIL
 FLIST_HEAD(disk_list);
-#endif
 
 unsigned long arch_flags = 0;