From e6580ede3f98ef92f58ec5ea4138232c9d0b9f62 Mon Sep 17 00:00:00 2001
From: Alasdair G Kergon <agk@redhat.com>
Date: Thu, 12 Jul 2007 17:26:47 +0100
Subject: [PATCH] --- yaml --- r: 59279 b: refs/heads/master c:
 ac818646d4be79123ad8dc5f1c4da8575d4960f8 h: refs/heads/master i:   59277:
 1c1f9319e7455ae03d0103da5f4bd61a0faef962   59275:
 e7a0c289252fe7cadb5405f1982f3a7ab9c7aa00   59271:
 a1a9a469fd1154ede9dc1721c4c5720b6cd1b965   59263:
 a8fb20ad1dcee7d9f3579b10ddddcf47609b01be v: v3

---
 [refs]                      |  2 +-
 trunk/drivers/md/dm-delay.c | 12 +++++-------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index cadbf8f1eb35..521ad39dde41 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 028867ac28e51afc834a5931e7545c022557eded
+refs/heads/master: ac818646d4be79123ad8dc5f1c4da8575d4960f8
diff --git a/trunk/drivers/md/dm-delay.c b/trunk/drivers/md/dm-delay.c
index eb218266cbf3..6928c136d3c5 100644
--- a/trunk/drivers/md/dm-delay.c
+++ b/trunk/drivers/md/dm-delay.c
@@ -20,7 +20,7 @@
 
 struct delay_c {
 	struct timer_list delay_timer;
-	struct semaphore timer_lock;
+	struct mutex timer_lock;
 	struct work_struct flush_expired_bios;
 	struct list_head delayed_bios;
 	atomic_t may_delay;
@@ -58,12 +58,12 @@ static void handle_delayed_timer(unsigned long data)
 
 static void queue_timeout(struct delay_c *dc, unsigned long expires)
 {
-	down(&dc->timer_lock);
+	mutex_lock(&dc->timer_lock);
 
 	if (!timer_pending(&dc->delay_timer) || expires < dc->delay_timer.expires)
 		mod_timer(&dc->delay_timer, expires);
 
-	up(&dc->timer_lock);
+	mutex_unlock(&dc->timer_lock);
 }
 
 static void flush_bios(struct bio *bio)
@@ -193,13 +193,11 @@ static int delay_ctr(struct dm_target *ti, unsigned int argc, char **argv)
 		goto bad;
 	}
 
-	init_timer(&dc->delay_timer);
-	dc->delay_timer.function = handle_delayed_timer;
-	dc->delay_timer.data = (unsigned long)dc;
+	setup_timer(&dc->delay_timer, handle_delayed_timer, (unsigned long)dc);
 
 	INIT_WORK(&dc->flush_expired_bios, flush_expired_bios);
 	INIT_LIST_HEAD(&dc->delayed_bios);
-	init_MUTEX(&dc->timer_lock);
+	mutex_init(&dc->timer_lock);
 	atomic_set(&dc->may_delay, 1);
 
 	ti->private = dc;