Fix segfault race on exit for platforms that don't have disk util support

[fio.git] / diskutil.c

diff --git a/diskutil.c b/diskutil.c
index d2c0b976f1c89208cf30cc99feed81e438a03b8c..d98e39a50b0d6423febdf0457f5097718ad53382 100644 (file)
--- a/diskutil.c
+++ b/diskutil.c
@@ -15,7 +15,6 @@ static int last_majdev, last_mindev;
 static struct disk_util *last_du;
 
 static struct fio_mutex *disk_util_mutex;
-static int disk_util_exit;
 
 FLIST_HEAD(disk_list);
 
@@ -539,16 +538,13 @@ static void aggregate_slaves_stats(struct disk_util *masterdu)
                agg->max_util.u.f = 100.0;
 }
 
-void free_disk_util(void)
+void disk_util_prune_entries(void)
 {
-       struct disk_util *du;
-
-       disk_util_exit = 1;
-       wait_for_disk_thread_exit();
-
        fio_mutex_down(disk_util_mutex);
 
        while (!flist_empty(&disk_list)) {
+               struct disk_util *du;
+
                du = flist_entry(disk_list.next, struct disk_util, list);
                flist_del(&du->list);
                disk_util_free(du);