diff options
| author | Li Zefan <lizf@cn.fujitsu.com> | 2008-09-05 14:00:18 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-05 14:39:37 -0700 |
| commit | 11d55d2cba6e867be8955e5ae011c54c556b849f (patch) | |
| tree | 53a0746c05e5922a2c35db9201d8d92818c4ed67 | |
| parent | 7f621861fbdb1ea90c36b1a59a45cb84b4a2239f (diff) | |
| download | kernel-common-11d55d2cba6e867be8955e5ae011c54c556b849f.tar.gz kernel-common-11d55d2cba6e867be8955e5ae011c54c556b849f.tar.bz2 kernel-common-11d55d2cba6e867be8955e5ae011c54c556b849f.zip | |
res_counter: fix off-by-one bug in setting limit
I found we can no longer set limit to 0 with 2.6.27-rcX:
# mount -t cgroup -omemory xxx /mnt
# mkdir /mnt/0
# echo 0 > /mnt/0/memory.limit_in_bytes
bash: echo: write error: Device or resource busy
It turned out 'limit' can't be set to 'usage', which is wrong IMO.
Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
Acked-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Acked-by: Balbir Singh <balbir@linux.vnet.ibm.com>
Acked-by: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | include/linux/res_counter.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/res_counter.h b/include/linux/res_counter.h index fdeadd9740dc..271c1c2c9f6f 100644 --- a/include/linux/res_counter.h +++ b/include/linux/res_counter.h @@ -166,7 +166,7 @@ static inline int res_counter_set_limit(struct res_counter *cnt, int ret = -EBUSY; spin_lock_irqsave(&cnt->lock, flags); - if (cnt->usage < limit) { + if (cnt->usage <= limit) { cnt->limit = limit; ret = 0; } |