diff options
author | Eric W. Biederman <ebiederm@xmission.com> | 2012-03-14 15:24:19 -0700 |
---|---|---|
committer | Eric W. Biederman <ebiederm@xmission.com> | 2012-05-03 03:28:39 -0700 |
commit | 76b6db010297d4928ab7b7e7c78dd982f413f0a4 (patch) | |
tree | 0d8fef729548a4f266684c0b7e56e4a9ed14780f /net/core | |
parent | 078de5f706ece36afd73bb4b8283314132d2dfdf (diff) | |
download | linux-stable-76b6db010297d4928ab7b7e7c78dd982f413f0a4.tar.gz linux-stable-76b6db010297d4928ab7b7e7c78dd982f413f0a4.tar.bz2 linux-stable-76b6db010297d4928ab7b7e7c78dd982f413f0a4.zip |
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 'net/core')
-rw-r--r-- | net/core/sock.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/core/sock.c b/net/core/sock.c index b2e14c07d920..e1ec8ba1381c 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -821,8 +821,8 @@ void cred_to_ucred(struct pid *pid, const struct cred *cred, if (cred) { struct user_namespace *current_ns = current_user_ns(); - ucred->uid = user_ns_map_uid(current_ns, cred, cred->euid); - ucred->gid = user_ns_map_gid(current_ns, cred, cred->egid); + ucred->uid = from_kuid(current_ns, cred->euid); + ucred->gid = from_kgid(current_ns, cred->egid); } } EXPORT_SYMBOL_GPL(cred_to_ucred); |