Merge branch 'master'

[linux-2.6-omap-h63xx.git] / fs / gfs2 / locking.c

diff --git a/fs/gfs2/locking.c b/fs/gfs2/locking.c
index 2d2f8fe53999dbafc88e794b7cf3cb54d448bf00..6a78aacb26af90fe2f8fb04d1036d9ef75a54825 100644 (file)
--- a/fs/gfs2/locking.c
+++ b/fs/gfs2/locking.c
@@ -28,7 +28,7 @@ struct lmh_wrapper {
    of them by name at mount time, e.g. lock_nolock, lock_dlm. */
 
 static struct list_head lmh_list;
-static struct semaphore lmh_lock;
+static struct mutex lmh_lock;
 
 /**
  * gfs_register_lockproto - Register a low-level locking protocol
@@ -41,28 +41,27 @@ int gfs_register_lockproto(struct lm_lockops *proto)
 {
        struct lmh_wrapper *lw;
 
-       down(&lmh_lock);
+       mutex_lock(&lmh_lock);
 
        list_for_each_entry(lw, &lmh_list, lw_list) {
                if (!strcmp(lw->lw_ops->lm_proto_name, proto->lm_proto_name)) {
-                       up(&lmh_lock);
-                       printk("GFS2: protocol %s already exists\n",
+                       mutex_unlock(&lmh_lock);
+                       printk(KERN_INFO "GFS2: protocol %s already exists\n",
                               proto->lm_proto_name);
                        return -EEXIST;
                }
        }
 
-       lw = kmalloc(sizeof(struct lmh_wrapper), GFP_KERNEL);
+       lw = kzalloc(sizeof(struct lmh_wrapper), GFP_KERNEL);
        if (!lw) {
-               up(&lmh_lock);
+               mutex_unlock(&lmh_lock);
                return -ENOMEM;
        }
-       memset(lw, 0, sizeof(struct lmh_wrapper));
 
        lw->lw_ops = proto;
        list_add(&lw->lw_list, &lmh_list);
 
-       up(&lmh_lock);
+       mutex_unlock(&lmh_lock);
 
        return 0;
 }
@@ -77,20 +76,20 @@ void gfs_unregister_lockproto(struct lm_lockops *proto)
 {
        struct lmh_wrapper *lw;
 
-       down(&lmh_lock);
+       mutex_lock(&lmh_lock);
 
        list_for_each_entry(lw, &lmh_list, lw_list) {
                if (!strcmp(lw->lw_ops->lm_proto_name, proto->lm_proto_name)) {
                        list_del(&lw->lw_list);
-                       up(&lmh_lock);
+                       mutex_unlock(&lmh_lock);
                        kfree(lw);
                        return;
                }
        }
 
-       up(&lmh_lock);
+       mutex_unlock(&lmh_lock);
 
-       printk("GFS2: can't unregister lock protocol %s\n",
+       printk(KERN_WARNING "GFS2: can't unregister lock protocol %s\n",
               proto->lm_proto_name);
 }
 
@@ -119,7 +118,7 @@ int gfs2_mount_lockproto(char *proto_name, char *table_name, char *host_data,
        int error, found;
 
  retry:
-       down(&lmh_lock);
+       mutex_lock(&lmh_lock);
 
        found = 0;
        list_for_each_entry(lw, &lmh_list, lw_list) {
@@ -132,18 +131,18 @@ int gfs2_mount_lockproto(char *proto_name, char *table_name, char *host_data,
        if (!found) {
                if (!try && capable(CAP_SYS_MODULE)) {
                        try = 1;
-                       up(&lmh_lock);
+                       mutex_unlock(&lmh_lock);
                        request_module(proto_name);
                        goto retry;
                }
-               printk("GFS2: can't find protocol %s\n", proto_name);
+               printk(KERN_INFO "GFS2: can't find protocol %s\n", proto_name);
                error = -ENOENT;
                goto out;
        }
 
        if (!try_module_get(lw->lw_ops->lm_owner)) {
                try = 0;
-               up(&lmh_lock);
+               mutex_unlock(&lmh_lock);
                msleep(1000);
                goto retry;
        }
@@ -153,17 +152,17 @@ int gfs2_mount_lockproto(char *proto_name, char *table_name, char *host_data,
        if (error)
                module_put(lw->lw_ops->lm_owner);
  out:
-       up(&lmh_lock);
+       mutex_unlock(&lmh_lock);
        return error;
 }
 
 void gfs2_unmount_lockproto(struct lm_lockstruct *lockstruct)
 {
-       down(&lmh_lock);
+       mutex_lock(&lmh_lock);
        lockstruct->ls_ops->lm_unmount(lockstruct->ls_lockspace);
        if (lockstruct->ls_ops->lm_owner)
                module_put(lockstruct->ls_ops->lm_owner);
-       up(&lmh_lock);
+       mutex_unlock(&lmh_lock);
 }
 
 /**
@@ -174,16 +173,16 @@ void gfs2_unmount_lockproto(struct lm_lockstruct *lockstruct)
 
 void gfs2_withdraw_lockproto(struct lm_lockstruct *lockstruct)
 {
-       down(&lmh_lock);
+       mutex_lock(&lmh_lock);
        lockstruct->ls_ops->lm_withdraw(lockstruct->ls_lockspace);
        if (lockstruct->ls_ops->lm_owner)
                module_put(lockstruct->ls_ops->lm_owner);
-       up(&lmh_lock);
+       mutex_unlock(&lmh_lock);
 }
 
 void __init gfs2_init_lmh(void)
 {
-       init_MUTEX(&lmh_lock);
+       mutex_init(&lmh_lock);
        INIT_LIST_HEAD(&lmh_list);
 }