diff options
-rw-r--r-- | Documentation/cgroups/resource_counter.txt | 8 | ||||
-rw-r--r-- | include/linux/res_counter.h | 3 | ||||
-rw-r--r-- | kernel/res_counter.c | 10 |
3 files changed, 19 insertions, 2 deletions
diff --git a/Documentation/cgroups/resource_counter.txt b/Documentation/cgroups/resource_counter.txt index f3c4ec3626a2..0c4a344e78fa 100644 --- a/Documentation/cgroups/resource_counter.txt +++ b/Documentation/cgroups/resource_counter.txt | |||
@@ -92,6 +92,14 @@ to work with it. | |||
92 | 92 | ||
93 | The _locked routines imply that the res_counter->lock is taken. | 93 | The _locked routines imply that the res_counter->lock is taken. |
94 | 94 | ||
95 | f. void res_counter_uncharge_until | ||
96 | (struct res_counter *rc, struct res_counter *top, | ||
97 | unsinged long val) | ||
98 | |||
99 | Almost same as res_cunter_uncharge() but propagation of uncharge | ||
100 | stops when rc == top. This is useful when kill a res_coutner in | ||
101 | child cgroup. | ||
102 | |||
95 | 2.1 Other accounting routines | 103 | 2.1 Other accounting routines |
96 | 104 | ||
97 | There are more routines that may help you with common needs, like | 105 | There are more routines that may help you with common needs, like |
diff --git a/include/linux/res_counter.h b/include/linux/res_counter.h index fb201896a8b0..5de7a146ead9 100644 --- a/include/linux/res_counter.h +++ b/include/linux/res_counter.h | |||
@@ -135,6 +135,9 @@ int __must_check res_counter_charge_nofail(struct res_counter *counter, | |||
135 | void res_counter_uncharge_locked(struct res_counter *counter, unsigned long val); | 135 | void res_counter_uncharge_locked(struct res_counter *counter, unsigned long val); |
136 | void res_counter_uncharge(struct res_counter *counter, unsigned long val); | 136 | void res_counter_uncharge(struct res_counter *counter, unsigned long val); |
137 | 137 | ||
138 | void res_counter_uncharge_until(struct res_counter *counter, | ||
139 | struct res_counter *top, | ||
140 | unsigned long val); | ||
138 | /** | 141 | /** |
139 | * res_counter_margin - calculate chargeable space of a counter | 142 | * res_counter_margin - calculate chargeable space of a counter |
140 | * @cnt: the counter | 143 | * @cnt: the counter |
diff --git a/kernel/res_counter.c b/kernel/res_counter.c index bebe2b170d49..ad581aa2369a 100644 --- a/kernel/res_counter.c +++ b/kernel/res_counter.c | |||
@@ -94,13 +94,15 @@ void res_counter_uncharge_locked(struct res_counter *counter, unsigned long val) | |||
94 | counter->usage -= val; | 94 | counter->usage -= val; |
95 | } | 95 | } |
96 | 96 | ||
97 | void res_counter_uncharge(struct res_counter *counter, unsigned long val) | 97 | void res_counter_uncharge_until(struct res_counter *counter, |
98 | struct res_counter *top, | ||
99 | unsigned long val) | ||
98 | { | 100 | { |
99 | unsigned long flags; | 101 | unsigned long flags; |
100 | struct res_counter *c; | 102 | struct res_counter *c; |
101 | 103 | ||
102 | local_irq_save(flags); | 104 | local_irq_save(flags); |
103 | for (c = counter; c != NULL; c = c->parent) { | 105 | for (c = counter; c != top; c = c->parent) { |
104 | spin_lock(&c->lock); | 106 | spin_lock(&c->lock); |
105 | res_counter_uncharge_locked(c, val); | 107 | res_counter_uncharge_locked(c, val); |
106 | spin_unlock(&c->lock); | 108 | spin_unlock(&c->lock); |
@@ -108,6 +110,10 @@ void res_counter_uncharge(struct res_counter *counter, unsigned long val) | |||
108 | local_irq_restore(flags); | 110 | local_irq_restore(flags); |
109 | } | 111 | } |
110 | 112 | ||
113 | void res_counter_uncharge(struct res_counter *counter, unsigned long val) | ||
114 | { | ||
115 | res_counter_uncharge_until(counter, NULL, val); | ||
116 | } | ||
111 | 117 | ||
112 | static inline unsigned long long * | 118 | static inline unsigned long long * |
113 | res_counter_member(struct res_counter *counter, int member) | 119 | res_counter_member(struct res_counter *counter, int member) |