Merge branch 'for-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup

[~andy/linux] / net / core / sock.c

diff --git a/net/core/sock.c b/net/core/sock.c
index 95aff9c7419b03ab9b16b218823f533d9a2cc042..1fb21b51593b4339e29d99bbb454da4c108ff829 100644 (file)
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -160,19 +160,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, ss);
+                       proto->destroy_cgroup(cgrp);
        mutex_unlock(&proto_list_mutex);
        return ret;
 }
 
-void mem_cgroup_sockets_destroy(struct cgroup *cgrp, struct cgroup_subsys *ss)
+void mem_cgroup_sockets_destroy(struct cgroup *cgrp)
 {
        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, ss);
+                       proto->destroy_cgroup(cgrp);
        mutex_unlock(&proto_list_mutex);
 }
 #endif