From b8d541d5705ef74307277d541ca9153ab8844096 Mon Sep 17 00:00:00 2001 From: Jens Axboe Date: Mon, 21 Jun 2010 12:40:53 +0200 Subject: [PATCH] Fix disk util for slaves Signed-off-by: Jens Axboe --- diskutil.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/diskutil.c b/diskutil.c index 92f8caa2..4f705c9b 100644 --- a/diskutil.c +++ b/diskutil.c @@ -24,6 +24,14 @@ static void disk_util_free(struct disk_util *du) if (du == last_du) last_du = NULL; + while (!flist_empty(&du->slaves)) { + struct disk_util *slave; + + slave = flist_entry(du->slaves.next, struct disk_util, slavelist); + flist_del(&slave->slavelist); + slave->users--; + } + fio_mutex_remove(du->lock); sfree(du->name); sfree(du); @@ -236,8 +244,10 @@ static void find_add_disk_slaves(struct thread_data *td, char *path, /* Should probably use an assert here. slavedu should * always be present at this point. */ - if (slavedu) + if (slavedu) { + slavedu->users++; flist_add_tail(&slavedu->slavelist, &masterdu->slaves); + } } closedir(dirhandle); -- 2.25.1