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>

diff --git a/kernel/res_counter.c b/kernel/res_counter.c
index 07a29923aba21c13016f9b6b0d83f00b0d1fad60..bebe2b170d49ffd4c5b96590114f40d4d9fb69f9 100644 (file)
--- 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;
 }