---

yaml --- r: 284331 b: refs/heads/master c: 1398eee h: refs/heads/master i: 284329: 72cf596 284327: 2af40a7 v: v3
git-mirror · Jan 12, 2012 · 0ea3186 · 0ea3186
1 parent 33cde7a
commit 0ea3186
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cf778b00e96df6d64f8e21b8395d1f8a859ecdc7
+refs/heads/master: 1398eee08222a038fa5f017900f387e81f6e3ff4
diff --git a/trunk/net/ipv4/tcp_memcontrol.c b/trunk/net/ipv4/tcp_memcontrol.c
@@ -108,7 +108,7 @@ void tcp_destroy_cgroup(struct cgroup *cgrp, struct cgroup_subsys *ss)
 	tcp = tcp_from_cgproto(cg_proto);
 	percpu_counter_destroy(&tcp->tcp_sockets_allocated);
 
-	val = res_counter_read_u64(&tcp->tcp_memory_allocated, RES_USAGE);
+	val = res_counter_read_u64(&tcp->tcp_memory_allocated, RES_LIMIT);
 
 	if (val != RESOURCE_MAX)
 		jump_label_dec(&memcg_socket_limit_enabled);