[patch 2.6.15-mm4] sem2mutex: NFS, idmap.c

From: Ingo Molnar
Date: Sat Jan 14 2006 - 10:14:16 EST


From: Ingo Molnar <mingo@xxxxxxx>

semaphore to mutex conversion.

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

build and boot tested.

Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
----

fs/nfs/idmap.c | 42 ++++++++++++++++++++++--------------------
1 files changed, 22 insertions(+), 20 deletions(-)

Index: linux/fs/nfs/idmap.c
===================================================================
--- linux.orig/fs/nfs/idmap.c
+++ linux/fs/nfs/idmap.c
@@ -35,6 +35,7 @@
*/

#include <linux/module.h>
+#include <linux/mutex.h>
#include <linux/init.h>
#include <linux/types.h>
#include <linux/slab.h>
@@ -74,8 +76,8 @@ struct idmap {
struct dentry *idmap_dentry;
wait_queue_head_t idmap_wq;
struct idmap_msg idmap_im;
- struct semaphore idmap_lock; /* Serializes upcalls */
- struct semaphore idmap_im_lock; /* Protects the hashtable */
+ struct mutex idmap_lock; /* Serializes upcalls */
+ struct mutex idmap_im_lock; /* Protects the hashtable */
struct idmap_hashtable idmap_user_hash;
struct idmap_hashtable idmap_group_hash;
};
@@ -116,8 +118,8 @@ nfs_idmap_new(struct nfs4_client *clp)
return;
}

- init_MUTEX(&idmap->idmap_lock);
- init_MUTEX(&idmap->idmap_im_lock);
+ mutex_init(&idmap->idmap_lock);
+ mutex_init(&idmap->idmap_im_lock);
init_waitqueue_head(&idmap->idmap_wq);
idmap->idmap_user_hash.h_type = IDMAP_TYPE_USER;
idmap->idmap_group_hash.h_type = IDMAP_TYPE_GROUP;
@@ -232,8 +234,8 @@ nfs_idmap_id(struct idmap *idmap, struct
if (namelen >= IDMAP_NAMESZ)
return -EINVAL;

- down(&idmap->idmap_lock);
- down(&idmap->idmap_im_lock);
+ mutex_lock(&idmap->idmap_lock);
+ mutex_lock(&idmap->idmap_im_lock);

he = idmap_lookup_name(h, name, namelen);
if (he != NULL) {
@@ -259,11 +261,11 @@ nfs_idmap_id(struct idmap *idmap, struct
}

set_current_state(TASK_UNINTERRUPTIBLE);
- up(&idmap->idmap_im_lock);
+ mutex_unlock(&idmap->idmap_im_lock);
schedule();
current->state = TASK_RUNNING;
remove_wait_queue(&idmap->idmap_wq, &wq);
- down(&idmap->idmap_im_lock);
+ mutex_lock(&idmap->idmap_im_lock);

if (im->im_status & IDMAP_STATUS_SUCCESS) {
*id = im->im_id;
@@ -272,8 +274,8 @@ nfs_idmap_id(struct idmap *idmap, struct

out:
memset(im, 0, sizeof(*im));
- up(&idmap->idmap_im_lock);
- up(&idmap->idmap_lock);
+ mutex_unlock(&idmap->idmap_im_lock);
+ mutex_unlock(&idmap->idmap_lock);
return (ret);
}

@@ -293,8 +295,8 @@ nfs_idmap_name(struct idmap *idmap, stru

im = &idmap->idmap_im;

- down(&idmap->idmap_lock);
- down(&idmap->idmap_im_lock);
+ mutex_lock(&idmap->idmap_lock);
+ mutex_lock(&idmap->idmap_im_lock);

he = idmap_lookup_id(h, id);
if (he != 0) {
@@ -320,11 +322,11 @@ nfs_idmap_name(struct idmap *idmap, stru
}

set_current_state(TASK_UNINTERRUPTIBLE);
- up(&idmap->idmap_im_lock);
+ mutex_unlock(&idmap->idmap_im_lock);
schedule();
current->state = TASK_RUNNING;
remove_wait_queue(&idmap->idmap_wq, &wq);
- down(&idmap->idmap_im_lock);
+ mutex_lock(&idmap->idmap_im_lock);

if (im->im_status & IDMAP_STATUS_SUCCESS) {
if ((len = strnlen(im->im_name, IDMAP_NAMESZ)) == 0)
@@ -335,8 +337,8 @@ nfs_idmap_name(struct idmap *idmap, stru

out:
memset(im, 0, sizeof(*im));
- up(&idmap->idmap_im_lock);
- up(&idmap->idmap_lock);
+ mutex_unlock(&idmap->idmap_im_lock);
+ mutex_unlock(&idmap->idmap_lock);
return ret;
}

@@ -380,7 +382,7 @@ idmap_pipe_downcall(struct file *filp, c
if (copy_from_user(&im_in, src, mlen) != 0)
return (-EFAULT);

- down(&idmap->idmap_im_lock);
+ mutex_lock(&idmap->idmap_im_lock);

ret = mlen;
im->im_status = im_in.im_status;
@@ -440,7 +442,7 @@ idmap_pipe_downcall(struct file *filp, c
idmap_update_entry(he, im_in.im_name, namelen_in, im_in.im_id);
ret = mlen;
out:
- up(&idmap->idmap_im_lock);
+ mutex_unlock(&idmap->idmap_im_lock);
return ret;
}

@@ -452,10 +454,10 @@ idmap_pipe_destroy_msg(struct rpc_pipe_m

if (msg->errno >= 0)
return;
- down(&idmap->idmap_im_lock);
+ mutex_lock(&idmap->idmap_im_lock);
im->im_status = IDMAP_STATUS_LOOKUPFAIL;
wake_up(&idmap->idmap_wq);
- up(&idmap->idmap_im_lock);
+ mutex_unlock(&idmap->idmap_im_lock);
}

/*
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/