f2fs: fix inconsistent using of NM_WOUT_THRESHOLD
PATCH 1/2 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 <[email protected]>
--- fs/f2fs/node.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/f2fs/node.c +1 -1
@@ -236,7 +236,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);
Signature · 1 line
1.7.9.5
PATCH 2/2 f2fs: remove useless #include <linux/proc_fs.h> as we're now using sysfs as debug entry.
Signed-off-by Haicheng Li <[email protected]>
--- fs/f2fs/debug.c | 1 - fs/f2fs/gc.c | 1 - fs/f2fs/super.c | 1 - 3 files changed, 3 deletions(-)
fs/f2fs/debug.c +0 -1
@@ -13,7 +13,6 @@#include <linux/fs.h> #include <linux/backing-dev.h> -#include <linux/proc_fs.h> #include <linux/f2fs_fs.h> #include <linux/blkdev.h> #include <linux/debugfs.h>
fs/f2fs/gc.c +0 -1
@@ -11,7 +11,6 @@#include <linux/fs.h> #include <linux/module.h> #include <linux/backing-dev.h> -#include <linux/proc_fs.h> #include <linux/init.h> #include <linux/f2fs_fs.h> #include <linux/kthread.h>
fs/f2fs/super.c +0 -1
@@ -12,7 +12,6 @@#include <linux/init.h> #include <linux/fs.h> #include <linux/statfs.h> -#include <linux/proc_fs.h> #include <linux/buffer_head.h> #include <linux/backing-dev.h> #include <linux/kthread.h>
Signature · 1 line
1.7.9.5