Merge tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux-2.6

[cascardo/linux.git] / net / core / sock.c

diff --git a/net/core/sock.c b/net/core/sock.c
index f372d9b..653f8c0 100644 (file)
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -813,8 +813,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);