From: Haicheng Li Date: Sun, 28 Apr 2013 11:16:06 +0000 (+0800) Subject: f2fs: fix inconsistent using of NM_WOUT_THRESHOLD X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=6cac3759ce118a87103ce4342e6de98215d01787;p=linux-beck.git f2fs: fix inconsistent using of NM_WOUT_THRESHOLD try_to_free_nats() is usually called with parameter nr_shrink as "nm_i->nat_cnt - NM_WOUT_THRESHOLD" by flush_nat_entries() during checkpointing process. However, this is inconsistent with the actual threshold check as "if (nm_i->nat_cnt < 2 * NM_WOUT_THRESHOLD)" , which will ignore the free_nats requests when NM_WOUT_THRESHOLD < nm_i->nat_cnt < 2 * NM_WOUT_THRESHOLD So fix the threshold check condition. Signed-off-by: Haicheng Li Signed-off-by: Jaegeuk Kim --- diff --git a/fs/f2fs/node.c b/fs/f2fs/node.c index 6ff017245522..f14eb7b8b2c4 100644 --- a/fs/f2fs/node.c +++ b/fs/f2fs/node.c @@ -244,7 +244,7 @@ static int try_to_free_nats(struct f2fs_sb_info *sbi, int nr_shrink) { struct f2fs_nm_info *nm_i = NM_I(sbi); - if (nm_i->nat_cnt < 2 * NM_WOUT_THRESHOLD) + if (nm_i->nat_cnt <= NM_WOUT_THRESHOLD) return 0; write_lock(&nm_i->nat_tree_lock);