Merge git://oss.sgi.com:8090/oss/git/xfs-2.6

[sfrench/cifs-2.6.git] / kernel / user.c

diff --git a/kernel/user.c b/kernel/user.c
index d9deae43a9abbb0f8dfaeeb078e8fb83311bc481..2116642f42c62a2f6b02a7238a336d82621ad31f 100644 (file)
--- a/kernel/user.c
+++ b/kernel/user.c
@@ -105,15 +105,19 @@ void free_uid(struct user_struct *up)
 {
        unsigned long flags;
 
+       if (!up)
+               return;
+
        local_irq_save(flags);
-       if (up && atomic_dec_and_lock(&up->__count, &uidhash_lock)) {
+       if (atomic_dec_and_lock(&up->__count, &uidhash_lock)) {
                uid_hash_remove(up);
+               spin_unlock_irqrestore(&uidhash_lock, flags);
                key_put(up->uid_keyring);
                key_put(up->session_keyring);
                kmem_cache_free(uid_cachep, up);
-               spin_unlock(&uidhash_lock);
+       } else {
+               local_irq_restore(flags);
        }
-       local_irq_restore(flags);
 }
 
 struct user_struct * alloc_uid(uid_t uid)