summaryrefslogtreecommitdiffstats
path: root/kernel/res_counter.c
diff options
context:
space:
mode:
authorFrederic Weisbecker <fweisbec@gmail.com>2012-04-25 01:11:36 +0200
committerTejun Heo <tj@kernel.org>2012-04-27 14:37:09 -0700
commit0d4dde1ac9a5af74ac76c6ab90557d1ae7b8f5d8 (patch)
tree5e643c4d786b30814feec03f9731ea0d03c23fc4 /kernel/res_counter.c
parent4d8438f044d8aaac6fbba98316ba484dabea397d (diff)
downloadlinux-0d4dde1ac9a5af74ac76c6ab90557d1ae7b8f5d8.tar.gz
linux-0d4dde1ac9a5af74ac76c6ab90557d1ae7b8f5d8.tar.bz2
linux-0d4dde1ac9a5af74ac76c6ab90557d1ae7b8f5d8.zip
res_counter: Account max_usage when calling res_counter_charge_nofail()
Updating max_usage is something one would expect when we reach a new maximum usage value even when we do this by forcing through the limit with res_counter_charge_nofail(). (Whether we want to account failcnt when we force through the limit is another debate). Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com> Signed-off-by: Tejun Heo <tj@kernel.org> Acked-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> Acked-by: Glauber Costa <glommer@parallels.com> Acked-by: Kirill A. Shutemov <kirill@shutemov.name> Cc: Li Zefan <lizefan@huawei.com>
Diffstat (limited to 'kernel/res_counter.c')
-rw-r--r--kernel/res_counter.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/res_counter.c b/kernel/res_counter.c
index 07a29923aba2..bebe2b170d49 100644
--- a/kernel/res_counter.c
+++ b/kernel/res_counter.c
@@ -35,7 +35,7 @@ int res_counter_charge_locked(struct res_counter *counter, unsigned long val,
}
counter->usage += val;
- if (!force && counter->usage > counter->max_usage)
+ if (counter->usage > counter->max_usage)
counter->max_usage = counter->usage;
return ret;
}