summaryrefslogtreecommitdiff
path: root/Documentation/cgroups
diff options
context:
space:
mode:
authorFrederic Weisbecker <fweisbec@gmail.com>2012-04-25 01:11:35 +0200
committerTejun Heo <tj@kernel.org>2012-04-27 14:36:45 -0700
commit4d8438f044d8aaac6fbba98316ba484dabea397d (patch)
tree90c63abf93502bfecff1f098732c2f0a0d13c024 /Documentation/cgroups
parentc4c27fbdda4e8ba87806c415b6d15266b07bce4b (diff)
downloadlwn-4d8438f044d8aaac6fbba98316ba484dabea397d.tar.gz
lwn-4d8438f044d8aaac6fbba98316ba484dabea397d.zip
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>
Diffstat (limited to 'Documentation/cgroups')
-rw-r--r--Documentation/cgroups/resource_counter.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/cgroups/resource_counter.txt b/Documentation/cgroups/resource_counter.txt
index 95b24d766eab..f3c4ec3626a2 100644
--- a/Documentation/cgroups/resource_counter.txt
+++ b/Documentation/cgroups/resource_counter.txt
@@ -77,11 +77,11 @@ to work with it.
where the charging failed.
d. int res_counter_charge_locked
- (struct res_counter *rc, unsigned long val)
+ (struct res_counter *rc, unsigned long val, bool force)
The same as res_counter_charge(), but it must not acquire/release the
res_counter->lock internally (it must be called with res_counter->lock
- held).
+ held). The force parameter indicates whether we can bypass the limit.
e. void res_counter_uncharge[_locked]
(struct res_counter *rc, unsigned long val)