Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 36f57413 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds
Browse files

[PATCH] free_uid() locking improvement 



Reduce lock hold times in free_uid().

Cc: Ingo Molnar <mingo@elte.hu>
Cc: "Paul E. McKenney" <paulmck@us.ibm.com>
Cc: David Howells <dhowells@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 3cf64b93

kernel/user.c

+7 −3
Original line number Diff line number Diff line
@@ -105,16 +105,20 @@ 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);

	}

}



struct user_struct * alloc_uid(uid_t uid)

{