From: Chao Yu Date: Sun, 11 Nov 2018 16:55:44 +0000 (+0800) Subject: f2fs: fix to be aware discard/preflush/dio command in is_idle() X-Git-Tag: rel_imx_5.10.35_2.0.0-somdevices.0~5618^2~30 X-Git-Url: https://git.somdevices.com/?a=commitdiff_plain;h=fef4129ec2e691a8411584c8bd126a35d0870298;p=linux.git f2fs: fix to be aware discard/preflush/dio command in is_idle() This patch adds missing in-flight discard/preflush/dio command count check in is_idle(). Signed-off-by: Chao Yu Signed-off-by: Jaegeuk Kim --- diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h index bebf26c67061..df10394bd806 100644 --- a/fs/f2fs/f2fs.h +++ b/fs/f2fs/f2fs.h @@ -2158,7 +2158,11 @@ static inline bool is_idle(struct f2fs_sb_info *sbi, int type) { if (get_pages(sbi, F2FS_RD_DATA) || get_pages(sbi, F2FS_RD_NODE) || get_pages(sbi, F2FS_RD_META) || get_pages(sbi, F2FS_WB_DATA) || - get_pages(sbi, F2FS_WB_CP_DATA)) + get_pages(sbi, F2FS_WB_CP_DATA) || + get_pages(sbi, F2FS_DIO_READ) || + get_pages(sbi, F2FS_DIO_WRITE) || + atomic_read(&SM_I(sbi)->dcc_info->issing_discard) || + atomic_read(&SM_I(sbi)->fcc_info->issing_flush)) return false; return f2fs_time_over(sbi, type); }