aboutsummaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-02-15 20:08:55 +0100
committerIngo Molnar <mingo@elte.hu>2009-02-15 20:08:55 +0100
commit9abd60304816a5b0fd9e51034f78e3eaed89f901 (patch)
tree5fb431bbfd133b6e2d19dabd196d87ea5bf281cf /kernel
parent5fb896a4e916e72efec4772b66be1cce3d6a9143 (diff)
parentf9aa28adfc6a4b01268ebb6d88566cca8627905f (diff)
Merge branches 'tracing/ftrace' and 'tracing/urgent' into tracing/core
Conflicts: kernel/trace/trace_mmiotrace.c
Diffstat (limited to 'kernel')
-rw-r--r--kernel/user.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/kernel/user.c b/kernel/user.c
index 477b6660f44..3551ac74239 100644
--- a/kernel/user.c
+++ b/kernel/user.c
@@ -72,6 +72,7 @@ static void uid_hash_insert(struct user_struct *up, struct hlist_head *hashent)
static void uid_hash_remove(struct user_struct *up)
{
hlist_del_init(&up->uidhash_node);
+ put_user_ns(up->user_ns);
}
static struct user_struct *uid_hash_find(uid_t uid, struct hlist_head *hashent)
@@ -334,7 +335,6 @@ static void free_user(struct user_struct *up, unsigned long flags)
atomic_inc(&up->__count);
spin_unlock_irqrestore(&uidhash_lock, flags);
- put_user_ns(up->user_ns);
INIT_WORK(&up->work, remove_user_sysfs_dir);
schedule_work(&up->work);
}
@@ -357,7 +357,6 @@ static void free_user(struct user_struct *up, unsigned long flags)
sched_destroy_user(up);
key_put(up->uid_keyring);
key_put(up->session_keyring);
- put_user_ns(up->user_ns);
kmem_cache_free(uid_cachep, up);
}