From 0ea31861fcfa867f6ef2ef1cec9512556b6db9f8 Mon Sep 17 00:00:00 2001 From: Glauber Costa Date: Thu, 12 Jan 2012 02:16:06 +0000 Subject: [PATCH] --- yaml --- r: 284331 b: refs/heads/master c: 1398eee08222a038fa5f017900f387e81f6e3ff4 h: refs/heads/master i: 284329: 72cf59651ea7f7e2e5a0b1518437cdfc1b9711dc 284327: 2af40a7b9b5bd2e6f096320ec5997edfeb5cd76d v: v3 --- [refs] | 2 +- trunk/net/ipv4/tcp_memcontrol.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 4b296052f9d4..ff4941f9362d 100644 --- 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 index 7fed04f875c1..49978788a9dc 100644 --- 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);