From: Frederic Weisbecker <fweisbec@gmail.com>
Date: Tue, 24 Apr 2012 23:11:35 +0000 (+0200)
Subject: res_counter: Merge res_counter_charge and res_counter_charge_nofail
X-Git-Tag: v3.5-rc1~142^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4d8438f044d8aaac6fbba98316ba484dabea397d;p=pandora-kernel.git

res_counter: Merge res_counter_charge and res_counter_charge_nofail

These two functions do almost the same thing and duplicate some code.
Merge their implementation into a single common function.
res_counter_charge_locked() takes one more parameter but it doesn't seem
to be used outside res_counter.c yet anyway.

There is no (intended) change in the behaviour.

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>
---

Reading git-diff-tree failed