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 5efcd63..653f8c0 100644 (file)
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -143,7 +143,7 @@ static DEFINE_MUTEX(proto_list_mutex);
 static LIST_HEAD(proto_list);
 
 #ifdef CONFIG_CGROUP_MEM_RES_CTLR_KMEM
-int mem_cgroup_sockets_init(struct cgroup *cgrp, struct cgroup_subsys *ss)
+int mem_cgroup_sockets_init(struct mem_cgroup *memcg, struct cgroup_subsys *ss)
 {
        struct proto *proto;
        int ret = 0;
@@ -151,7 +151,7 @@ int mem_cgroup_sockets_init(struct cgroup *cgrp, struct cgroup_subsys *ss)
        mutex_lock(&proto_list_mutex);
        list_for_each_entry(proto, &proto_list, node) {
                if (proto->init_cgroup) {
-                       ret = proto->init_cgroup(cgrp, ss);
+                       ret = proto->init_cgroup(memcg, ss);
                        if (ret)
                                goto out;
                }
@@ -162,19 +162,19 @@ int mem_cgroup_sockets_init(struct cgroup *cgrp, struct cgroup_subsys *ss)
 out:
        list_for_each_entry_continue_reverse(proto, &proto_list, node)
                if (proto->destroy_cgroup)
-                       proto->destroy_cgroup(cgrp);
+                       proto->destroy_cgroup(memcg);
        mutex_unlock(&proto_list_mutex);
        return ret;
 }
 
-void mem_cgroup_sockets_destroy(struct cgroup *cgrp)
+void mem_cgroup_sockets_destroy(struct mem_cgroup *memcg)
 {
        struct proto *proto;
 
        mutex_lock(&proto_list_mutex);
        list_for_each_entry_reverse(proto, &proto_list, node)
                if (proto->destroy_cgroup)
-                       proto->destroy_cgroup(cgrp);
+                       proto->destroy_cgroup(memcg);
        mutex_unlock(&proto_list_mutex);
 }
 #endif
@@ -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);