diff --git a/[refs] b/[refs] index 5bbab35b78ec..ecd7c9d002d9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4d8438f044d8aaac6fbba98316ba484dabea397d +refs/heads/master: 0d4dde1ac9a5af74ac76c6ab90557d1ae7b8f5d8 diff --git a/trunk/kernel/res_counter.c b/trunk/kernel/res_counter.c index 07a29923aba2..bebe2b170d49 100644 --- a/trunk/kernel/res_counter.c +++ b/trunk/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; }