diff options
| author | Jaegeuk Kim <jaegeuk@kernel.org> | 2020-07-28 08:26:11 -0700 |
|---|---|---|
| committer | Jaegeuk Kim <jaegeuk@kernel.org> | 2020-08-03 10:32:51 -0700 |
| commit | 1fd280188d1f1e7318264a34aba435f3b69e71e8 (patch) | |
| tree | 05d4d01400922dd9c363bb85cf0e388c5cd97ee0 /fs | |
| parent | 1f07cc58bc92bdea261b7cca12eec2f2827edab6 (diff) | |
| download | linux-1fd280188d1f1e7318264a34aba435f3b69e71e8.tar.gz linux-1fd280188d1f1e7318264a34aba435f3b69e71e8.tar.bz2 linux-1fd280188d1f1e7318264a34aba435f3b69e71e8.zip | |
f2fs: fix deadlock between quota writes and checkpoint
f2fs_write_data_pages(quota_mapping)
__f2fs_write_data_pages f2fs_write_checkpoint
* blk_start_plug(&plug);
* add bio in write_io[DATA]
- block_operations
- skip syncing quota by
>DEFAULT_RETRY_QUOTA_FLUSH_COUNT
- down_write(&sbi->node_write);
- f2fs_write_single_data_page
- down_read(node_write)
- f2fs_wait_on_all_pages(F2FS_WB_CP_DATA);
Signed-off-by: Daeho Jeong <daehojeong@google.com>
Reviewed-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/f2fs/checkpoint.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/f2fs/checkpoint.c b/fs/f2fs/checkpoint.c index 8c782d3f324f..99c8061da55b 100644 --- a/fs/f2fs/checkpoint.c +++ b/fs/f2fs/checkpoint.c @@ -1269,6 +1269,8 @@ void f2fs_wait_on_all_pages(struct f2fs_sb_info *sbi, int type) if (type == F2FS_DIRTY_META) f2fs_sync_meta_pages(sbi, META, LONG_MAX, FS_CP_META_IO); + else if (type == F2FS_WB_CP_DATA) + f2fs_submit_merged_write(sbi, DATA); io_schedule_timeout(DEFAULT_IO_TIMEOUT); } finish_wait(&sbi->cp_wait, &wait); |