diff options
| author | Jaegeuk Kim <jaegeuk@kernel.org> | 2019-01-25 12:05:25 -0800 |
|---|---|---|
| committer | Jaegeuk Kim <jaegeuk@kernel.org> | 2019-02-15 20:59:45 -0800 |
| commit | 11ac8ef8d8c575409dcce3bcf1dda3c9f8c7f5e9 (patch) | |
| tree | 3d64d5f72e27fff19a744e1952078c38119e2c98 | |
| parent | b460866d27089ffaf915a5a3340b4d8c9f079d33 (diff) | |
| download | linux-11ac8ef8d8c575409dcce3bcf1dda3c9f8c7f5e9.tar.gz linux-11ac8ef8d8c575409dcce3bcf1dda3c9f8c7f5e9.tar.bz2 linux-11ac8ef8d8c575409dcce3bcf1dda3c9f8c7f5e9.zip | |
f2fs: avoid null pointer exception in dcc_info
If dcc_info is not set yet, we can get null pointer panic.
Reviewed-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
| -rw-r--r-- | fs/f2fs/f2fs.h | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h index fe95abb05d40..8c928cd72b61 100644 --- a/fs/f2fs/f2fs.h +++ b/fs/f2fs/f2fs.h @@ -2161,10 +2161,17 @@ static inline bool is_idle(struct f2fs_sb_info *sbi, int type) get_pages(sbi, F2FS_RD_META) || get_pages(sbi, F2FS_WB_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->queued_discard) || - atomic_read(&SM_I(sbi)->fcc_info->queued_flush)) + get_pages(sbi, F2FS_DIO_WRITE)) return false; + + if (SM_I(sbi) && SM_I(sbi)->dcc_info && + atomic_read(&SM_I(sbi)->dcc_info->queued_discard)) + return false; + + if (SM_I(sbi) && SM_I(sbi)->fcc_info && + atomic_read(&SM_I(sbi)->fcc_info->queued_flush)) + return false; + return f2fs_time_over(sbi, type); } |