diff --git a/[refs] b/[refs] index d29135728424..6b0856b19693 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 18b6e0414e42d95183f07d8177e3ff0241abd825 +refs/heads/master: 6ded6ab9be4f6164aef1c527407c1b94f0929799 diff --git a/trunk/kernel/user.c b/trunk/kernel/user.c index c0ef3a464438..97202cb29adc 100644 --- a/trunk/kernel/user.c +++ b/trunk/kernel/user.c @@ -361,7 +361,7 @@ struct user_struct *find_user(uid_t uid) { struct user_struct *ret; unsigned long flags; - struct user_namespace *ns = current_user()->user_ns; + struct user_namespace *ns = current_user_ns(); spin_lock_irqsave(&uidhash_lock, flags); ret = uid_hash_find(uid, uidhashentry(ns, uid));