ipc: convert sem_undo_list.refcnt from atomic_t to refcount_t

[linux.git] / ipc / sem.c

diff --git a/ipc/sem.c b/ipc/sem.c
index 38371e93bfa5c4f101e264b46eab6a19f2f02404..31b138b9e75636671b35198a0970631c7b5c8b12 100644 (file)
--- a/ipc/sem.c
+++ b/ipc/sem.c
@@ -122,7 +122,7 @@ struct sem_undo {
  * that may be shared among all a CLONE_SYSVSEM task group.
  */
 struct sem_undo_list {
-       atomic_t                refcnt;
+       refcount_t              refcnt;
        spinlock_t              lock;
        struct list_head        list_proc;
 };
@@ -1642,7 +1642,7 @@ static inline int get_undo_list(struct sem_undo_list **undo_listp)
                if (undo_list == NULL)
                        return -ENOMEM;
                spin_lock_init(&undo_list->lock);
-               atomic_set(&undo_list->refcnt, 1);
+               refcount_set(&undo_list->refcnt, 1);
                INIT_LIST_HEAD(&undo_list->list_proc);
 
                current->sysvsem.undo_list = undo_list;
@@ -2041,7 +2041,7 @@ int copy_semundo(unsigned long clone_flags, struct task_struct *tsk)
                error = get_undo_list(&undo_list);
                if (error)
                        return error;
-               atomic_inc(&undo_list->refcnt);
+               refcount_inc(&undo_list->refcnt);
                tsk->sysvsem.undo_list = undo_list;
        } else
                tsk->sysvsem.undo_list = NULL;
@@ -2070,7 +2070,7 @@ void exit_sem(struct task_struct *tsk)
                return;
        tsk->sysvsem.undo_list = NULL;
 
-       if (!atomic_dec_and_test(&ulp->refcnt))
+       if (!refcount_dec_and_test(&ulp->refcnt))
                return;
 
        for (;;) {
@@ -2091,7 +2091,8 @@ void exit_sem(struct task_struct *tsk)
                         * possibility where we exit while freeary() didn't
                         * finish unlocking sem_undo_list.
                         */
-                       spin_unlock_wait(&ulp->lock);
+                       spin_lock(&ulp->lock);
+                       spin_unlock(&ulp->lock);
                        rcu_read_unlock();
                        break;
                }