[PATCH] sem2mutex: ipc, id.sem

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: Manfred Spraul <manfred@colorfullife.com>
Signed-off-by: Lee Schermerhorn <lee.schermerhorn@hp.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 15 insertions, 14 deletions

diff --git a/ipc/util.c b/ipc/util.c
index 862621980b01..23151ef32590 100644
--- a/ipc/util.c
+++ b/ipc/util.c
@@ -68,7 +68,8 @@ __initcall(ipc_init);
 void __init ipc_init_ids(struct ipc_ids* ids, int size)
 {
         int i;
-        sema_init(&ids->sem,1);
+
+        mutex_init(&ids->mutex);
 
         if(size > IPCMNI)
                 size = IPCMNI;
@@ -138,7 +139,7 @@ void __init ipc_init_proc_interface(const char *path, const char *header,
  *      @ids: Identifier set
  *      @key: The key to find
  *      
- *      Requires ipc_ids.sem locked.
+ *      Requires ipc_ids.mutex locked.
  *      Returns the identifier if found or -1 if not.
  */
  
@@ -150,7 +151,7 @@ int ipc_findkey(struct ipc_ids* ids, key_t key)
 
         /*
          * rcu_dereference() is not needed here
-         * since ipc_ids.sem is held
+         * since ipc_ids.mutex is held
          */
         for (id = 0; id <= max_id; id++) {
                 p = ids->entries->p[id];
@@ -163,7 +164,7 @@ int ipc_findkey(struct ipc_ids* ids, key_t key)
 }
 
 /*
- * Requires ipc_ids.sem locked
+ * Requires ipc_ids.mutex locked
  */
 static int grow_ary(struct ipc_ids* ids, int newsize)
 {
@@ -210,7 +211,7 @@ static int grow_ary(struct ipc_ids* ids, int newsize)
  *      is returned. The list is returned in a locked state on success.
  *      On failure the list is not locked and -1 is returned.
  *
- *      Called with ipc_ids.sem held.
+ *      Called with ipc_ids.mutex held.
  */
  
 int ipc_addid(struct ipc_ids* ids, struct kern_ipc_perm* new, int size)
@@ -221,7 +222,7 @@ int ipc_addid(struct ipc_ids* ids, struct kern_ipc_perm* new, int size)
 
         /*
          * rcu_dereference()() is not needed here since
-         * ipc_ids.sem is held
+         * ipc_ids.mutex is held
          */
         for (id = 0; id < size; id++) {
                 if(ids->entries->p[id] == NULL)
@@ -257,7 +258,7 @@ found:
  *      fed an invalid identifier. The entry is removed and internal
  *      variables recomputed. The object associated with the identifier
  *      is returned.
- *      ipc_ids.sem and the spinlock for this ID is hold before this function
+ *      ipc_ids.mutex and the spinlock for this ID is hold before this function
  *      is called, and remain locked on the exit.
  */
  
@@ -270,7 +271,7 @@ struct kern_ipc_perm* ipc_rmid(struct ipc_ids* ids, int id)
 
         /* 
          * do not need a rcu_dereference()() here to force ordering
-         * on Alpha, since the ipc_ids.sem is held.
+         * on Alpha, since the ipc_ids.mutex is held.
          */     
         p = ids->entries->p[lid];
         ids->entries->p[lid] = NULL;
@@ -530,13 +531,13 @@ void ipc64_perm_to_ipc_perm (struct ipc64_perm *in, struct ipc_perm *out)
 
 /*
  * So far only shm_get_stat() calls ipc_get() via shm_get(), so ipc_get()
- * is called with shm_ids.sem locked.  Since grow_ary() is also called with
- * shm_ids.sem down(for Shared Memory), there is no need to add read 
+ * is called with shm_ids.mutex locked.  Since grow_ary() is also called with
+ * shm_ids.mutex down(for Shared Memory), there is no need to add read
  * barriers here to gurantee the writes in grow_ary() are seen in order 
  * here (for Alpha).
  *
- * However ipc_get() itself does not necessary require ipc_ids.sem down. So
- * if in the future ipc_get() is used by other places without ipc_ids.sem
+ * However ipc_get() itself does not necessary require ipc_ids.mutex down. So
+ * if in the future ipc_get() is used by other places without ipc_ids.mutex
  * down, then ipc_get() needs read memery barriers as ipc_lock() does.
  */
 struct kern_ipc_perm* ipc_get(struct ipc_ids* ids, int id)
@@ -667,7 +668,7 @@ static void *sysvipc_proc_start(struct seq_file *s, loff_t *pos)
          * Take the lock - this will be released by the corresponding
          * call to stop().
          */
-        down(&iface->ids->sem);
+        mutex_lock(&iface->ids->mutex);
 
         /* pos < 0 is invalid */
         if (*pos < 0)
@@ -697,7 +698,7 @@ static void sysvipc_proc_stop(struct seq_file *s, void *it)
                 ipc_unlock(ipc);
 
         /* Release the lock we took in start() */
-        up(&iface->ids->sem);
+        mutex_unlock(&iface->ids->mutex);
 }
 
 static int sysvipc_proc_show(struct seq_file *s, void *it)