From 9c5b95faa46f79366cf82228aa1d248907e64ff9 Mon Sep 17 00:00:00 2001
From: Matthias Kaehlcke <matthias.kaehlcke@gmail.com>
Date: Fri, 19 Oct 2007 22:38:52 +0100
Subject: [PATCH] --- yaml --- r: 71717 b: refs/heads/master c:
 def5b5b26e6d97820465fadcb7d1cb73cc4daf33 h: refs/heads/master i:   71715:
 bf4cd3b6feddaed3a6aa4c492f6ee530bbc22f93 v: v3

---
 [refs]                    | 2 +-
 trunk/drivers/md/kcopyd.c | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index ba984cb689df..ca8f5ffc8751 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 094262db9e4c615e0db7a7b924d244b7a6c186b0
+refs/heads/master: def5b5b26e6d97820465fadcb7d1cb73cc4daf33
diff --git a/trunk/drivers/md/kcopyd.c b/trunk/drivers/md/kcopyd.c
index 7e052378c47e..f3831f31223e 100644
--- a/trunk/drivers/md/kcopyd.c
+++ b/trunk/drivers/md/kcopyd.c
@@ -198,7 +198,7 @@ struct kcopyd_job {
 	 * These fields are only used if the job has been split
 	 * into more manageable parts.
 	 */
-	struct semaphore lock;
+	struct mutex lock;
 	atomic_t sub_jobs;
 	sector_t progress;
 };
@@ -456,7 +456,7 @@ static void segment_complete(int read_err,
 	sector_t count = 0;
 	struct kcopyd_job *job = (struct kcopyd_job *) context;
 
-	down(&job->lock);
+	mutex_lock(&job->lock);
 
 	/* update the error */
 	if (read_err)
@@ -480,7 +480,7 @@ static void segment_complete(int read_err,
 			job->progress += count;
 		}
 	}
-	up(&job->lock);
+	mutex_unlock(&job->lock);
 
 	if (count) {
 		int i;
@@ -562,7 +562,7 @@ int kcopyd_copy(struct kcopyd_client *kc, struct io_region *from,
 		dispatch_job(job);
 
 	else {
-		init_MUTEX(&job->lock);
+		mutex_init(&job->lock);
 		job->progress = 0;
 		split_job(job);
 	}