Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 11d55d2c authored by Li Zefan's avatar Li Zefan Committed by Linus Torvalds
Browse files

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: default avatarLi Zefan <lizf@cn.fujitsu.com>
Acked-by: default avatarKAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Acked-by: default avatarBalbir Singh <balbir@linux.vnet.ibm.com>
Acked-by: default avatarPavel Emelyanov <xemul@openvz.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 7f621861

include/linux/res_counter.h

+1 −1
Original line number Diff line number Diff line
@@ -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;

	}