OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
02b16d0
)
f2fs: fix to be aware discard/preflush/dio command in is_idle()
author
Chao Yu
<yuchao0@huawei.com>
Sun, 11 Nov 2018 16:55:44 +0000
(
00:55
+0800)
committer
Jaegeuk Kim
<jaegeuk@kernel.org>
Mon, 26 Nov 2018 23:53:56 +0000
(15:53 -0800)
This patch adds missing in-flight discard/preflush/dio command count
check in is_idle().
Signed-off-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
fs/f2fs/f2fs.h
patch
|
blob
|
history
diff --git
a/fs/f2fs/f2fs.h
b/fs/f2fs/f2fs.h
index
bebf26c
..
df10394
100644
(file)
--- 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);
}