From 99614958d743d0fdea9b1875d3a41a5a51e9769d Mon Sep 17 00:00:00 2001
From: Jens Axboe <axboe@kernel.dk>
Date: Wed, 1 Aug 2012 20:25:53 +0200
Subject: Revert "diskutil: ensure that we lock around disk_list access"

This reverts commit feb418556a236aa041a625b083d6b99e55d23d74.

It causes hangs, needs further testing.
---
 diskutil.c | 46 ++++++----------------------------------------
 1 file changed, 6 insertions(+), 40 deletions(-)

(limited to 'diskutil.c')

diff --git a/diskutil.c b/diskutil.c
index 32616b75..feb88526 100644
--- a/diskutil.c
+++ b/diskutil.c
@@ -14,9 +14,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);
 
 static struct disk_util *__init_per_file_disk_util(struct thread_data *td,
@@ -105,26 +102,17 @@ static void update_io_tick_disk(struct disk_util *du)
 	memcpy(ldus, &__dus, sizeof(__dus));
 }
 
-int update_io_ticks(void)
+void update_io_ticks(void)
 {
 	struct flist_head *entry;
 	struct disk_util *du;
-	int ret = 0;
 
 	dprint(FD_DISKUTIL, "update io ticks\n");
 
-	fio_mutex_down(disk_util_mutex);
-
-	if (!disk_util_exit) {
-		flist_for_each(entry, &disk_list) {
-			du = flist_entry(entry, struct disk_util, list);
-			update_io_tick_disk(du);
-		}
-	} else
-		ret = 1;
-
-	fio_mutex_up(disk_util_mutex);
-	return ret;
+	flist_for_each(entry, &disk_list) {
+		du = flist_entry(entry, struct disk_util, list);
+		update_io_tick_disk(du);
+	}
 }
 
 static struct disk_util *disk_util_exists(int major, int minor)
@@ -288,8 +276,6 @@ static struct disk_util *disk_util_add(struct thread_data *td, int majdev,
 	du->lock = fio_mutex_init(1);
 	du->users = 0;
 
-	fio_mutex_down(disk_util_mutex);
-
 	flist_for_each(entry, &disk_list) {
 		__du = flist_entry(entry, struct disk_util, list);
 
@@ -297,7 +283,6 @@ static struct disk_util *disk_util_add(struct thread_data *td, int majdev,
 
 		if (!strcmp((char *) du->dus.name, (char *) __du->dus.name)) {
 			disk_util_free(du);
-			fio_mutex_up(disk_util_mutex);
 			return __du;
 		}
 	}
@@ -309,7 +294,6 @@ static struct disk_util *disk_util_add(struct thread_data *td, int majdev,
 
 	flist_add_tail(&du->list, &disk_list);
 	find_add_disk_slaves(td, path, du);
-	fio_mutex_up(disk_util_mutex);
 	return du;
 }
 
@@ -537,11 +521,6 @@ void free_disk_util(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)) {
 		du = flist_entry(disk_list.next, struct disk_util, list);
 		flist_del(&du->list);
@@ -549,8 +528,6 @@ void free_disk_util(void)
 	}
 
 	last_majdev = last_mindev = -1;
-	fio_mutex_up(disk_util_mutex);
-	fio_mutex_remove(disk_util_mutex);
 }
 
 void print_disk_util(struct disk_util_stat *dus, struct disk_util_agg *agg,
@@ -596,12 +573,8 @@ void show_disk_util(int terse)
 	struct flist_head *entry;
 	struct disk_util *du;
 
-	fio_mutex_down(disk_util_mutex);
-
-	if (flist_empty(&disk_list)) {
-		fio_mutex_up(disk_util_mutex);
+	if (flist_empty(&disk_list))
 		return;
-	}
 
 	if (!terse)
 		log_info("\nDisk stats (read/write):\n");
@@ -612,11 +585,4 @@ void show_disk_util(int terse)
 		aggregate_slaves_stats(du);
 		print_disk_util(&du->dus, &du->agg, terse);
 	}
-
-	fio_mutex_up(disk_util_mutex);
-}
-
-void setup_disk_util(void)
-{
-	disk_util_mutex = fio_mutex_init(1);
 }
-- 
cgit v1.2.3