summaryrefslogtreecommitdiffstats
path: root/kernel/signal.c
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2012-03-14 15:24:19 -0700
committerEric W. Biederman <ebiederm@xmission.com>2012-05-03 03:28:39 -0700
commit76b6db010297d4928ab7b7e7c78dd982f413f0a4 (patch)
tree0d8fef729548a4f266684c0b7e56e4a9ed14780f /kernel/signal.c
parent078de5f706ece36afd73bb4b8283314132d2dfdf (diff)
downloadop-kernel-dev-76b6db010297d4928ab7b7e7c78dd982f413f0a4.zip
op-kernel-dev-76b6db010297d4928ab7b7e7c78dd982f413f0a4.tar.gz
userns: Replace user_ns_map_uid and user_ns_map_gid with from_kuid and from_kgid
These function are no longer needed replace them with their more useful equivalents. Acked-by: Serge Hallyn <serge.hallyn@canonical.com> Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Diffstat (limited to 'kernel/signal.c')
-rw-r--r--kernel/signal.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/signal.c b/kernel/signal.c
index 2734dc9..d630327 100644
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -1026,7 +1026,7 @@ static inline int legacy_queue(struct sigpending *signals, int sig)
static inline uid_t map_cred_ns(const struct cred *cred,
struct user_namespace *ns)
{
- return user_ns_map_uid(ns, cred, cred->uid);
+ return from_kuid_munged(ns, cred->uid);
}
#ifdef CONFIG_USER_NS
OpenPOWER on IntegriCloud