[PATCH] sem2mutex: misc static one-file mutexes

Semaphore to mutex conversion.

The conversion was generated via scripts, and the result was validated
automatically via a script as well.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
Cc: Dave Jones <davej@codemonkey.org.uk>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Jens Axboe <axboe@suse.de>
Cc: Neil Brown <neilb@cse.unsw.edu.au>
Acked-by: Alasdair G Kergon <agk@redhat.com>
Cc: Greg KH <greg@kroah.com>
Cc: Dominik Brodowski <linux@dominikbrodowski.net>
Cc: Adam Belay <ambx1@neo.rr.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: "David S. Miller" <davem@davemloft.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 8 insertions, 8 deletions

diff --git a/drivers/md/kcopyd.c b/drivers/md/kcopyd.c
index 8b3515f394a6..0d54e8b7d9de 100644
--- a/drivers/md/kcopyd.c
+++ b/drivers/md/kcopyd.c
@@ -590,51 +590,51 @@ static void client_del(struct kcopyd_client *kc)
         up(&_client_lock);
 }
 
-static DECLARE_MUTEX(kcopyd_init_lock);
+static DEFINE_MUTEX(kcopyd_init_lock);
 static int kcopyd_clients = 0;
 
 static int kcopyd_init(void)
 {
         int r;
 
-        down(&kcopyd_init_lock);
+        mutex_lock(&kcopyd_init_lock);
 
         if (kcopyd_clients) {
                 /* Already initialized. */
                 kcopyd_clients++;
-                up(&kcopyd_init_lock);
+                mutex_unlock(&kcopyd_init_lock);
                 return 0;
         }
 
         r = jobs_init();
         if (r) {
-                up(&kcopyd_init_lock);
+                mutex_unlock(&kcopyd_init_lock);
                 return r;
         }
 
         _kcopyd_wq = create_singlethread_workqueue("kcopyd");
         if (!_kcopyd_wq) {
                 jobs_exit();
-                up(&kcopyd_init_lock);
+                mutex_unlock(&kcopyd_init_lock);
                 return -ENOMEM;
         }
 
         kcopyd_clients++;
         INIT_WORK(&_kcopyd_work, do_work, NULL);
-        up(&kcopyd_init_lock);
+        mutex_unlock(&kcopyd_init_lock);
         return 0;
 }
 
 static void kcopyd_exit(void)
 {
-        down(&kcopyd_init_lock);
+        mutex_lock(&kcopyd_init_lock);
         kcopyd_clients--;
         if (!kcopyd_clients) {
                 jobs_exit();
                 destroy_workqueue(_kcopyd_wq);
                 _kcopyd_wq = NULL;
         }
-        up(&kcopyd_init_lock);
+        mutex_unlock(&kcopyd_init_lock);
 }
 
 int kcopyd_client_create(unsigned int nr_pages, struct kcopyd_client **result)