From: Alan D. Brunelle <alan.brunelle@hp.com>
Date: Fri, 11 Sep 2009 18:57:10 +0000 (-0400)
Subject: Bug fix: handles disk device used multiple times
X-Git-Tag: fio-1.34~5
X-Git-Url: https://git.kernel.dk/?p=fio.git;a=commitdiff_plain;h=b06de82e3b075874733dd233571499c1c1ca453c

Bug fix: handles disk device used multiple times

There were issues in having the same underlying device being referenced
multiple times (via different paths) when reporting storage I/O
statistics. As an example: having two (or more) LVM2/DM volumes crafted
out of the same MD array.

This patch simply skips over any devices previously seen.

Signed-off-by: Alan D. Brunelle <alan.brunelle@hp.com>
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
---

diff --git a/diskutil.c b/diskutil.c
index cb15882f..62149d91 100644
--- a/diskutil.c
+++ b/diskutil.c
@@ -221,6 +221,13 @@ static void find_add_disk_slaves(struct thread_data *td, char *path,
 			return;
 		}
 
+		/*
+		 * See if this maj,min already exists
+		 */
+		slavedu = disk_util_exists(majdev, mindev);
+		if (slavedu)
+			continue;
+
 		sprintf(temppath, "%s/%s", slavesdir, slavepath);
 		__init_per_file_disk_util(td, majdev, mindev, temppath);
 		slavedu = disk_util_exists(majdev, mindev);