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

[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
...@@ -105,15 +105,19 @@ void free_uid(struct user_struct *up) ...@@ -105,15 +105,19 @@ void free_uid(struct user_struct *up)
{ {
unsigned long flags; unsigned long flags;
if (!up)
return;
local_irq_save(flags); 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); uid_hash_remove(up);
spin_unlock_irqrestore(&uidhash_lock, flags);
key_put(up->uid_keyring); key_put(up->uid_keyring);
key_put(up->session_keyring); key_put(up->session_keyring);
kmem_cache_free(uid_cachep, up); 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) struct user_struct * alloc_uid(uid_t uid)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment