xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FROMGIT: f2fs: flush pending checkpoints when freezing super

Browse Source 
This avoids -EINVAL when trying to freeze f2fs.

Bug: 242127451
Cc: stable@vger.kernel.org
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Change-Id: Id2939642e3b93b42cf1ca03831d6c5e4e54d57fd
(cherry picked from commit a36fe7301268524ffa56ff8a9ad0edec6bd5b85a
     https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git dev)
This commit is contained in:
Jaegeuk Kim
2022-08-19 15:52:02 -07:00
committed by Jaegeuk Kim
parent 604f2f5656
commit 1c5313a9f7
3 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
fs/f2fs/checkpoint.c
View File

@@ -1863,15 +1863,27 @@ int f2fs_start_ckpt_thread(struct f2fs_sb_info *sbi)
void f2fs_stop_ckpt_thread(struct f2fs_sb_info *sbi) void f2fs_stop_ckpt_thread(struct f2fs_sb_info *sbi)
{ {
struct ckpt_req_control *cprc = &sbi->cprc_info; struct ckpt_req_control *cprc = &sbi->cprc_info;
struct task_struct *ckpt_task;
if (cprc->f2fs_issue_ckpt) { if (!cprc->f2fs_issue_ckpt)
struct task_struct *ckpt_task = cprc->f2fs_issue_ckpt; return;
ckpt_task = cprc->f2fs_issue_ckpt;
cprc->f2fs_issue_ckpt = NULL; cprc->f2fs_issue_ckpt = NULL;
kthread_stop(ckpt_task); kthread_stop(ckpt_task);
f2fs_flush_ckpt_thread(sbi);
}
void f2fs_flush_ckpt_thread(struct f2fs_sb_info *sbi)
{
struct ckpt_req_control *cprc = &sbi->cprc_info;
flush_remained_ckpt_reqs(sbi, NULL); flush_remained_ckpt_reqs(sbi, NULL);
}
/* Let's wait for the previous dispatched checkpoint. */
while (atomic_read(&cprc->queued_ckpt))
io_schedule_timeout(DEFAULT_IO_TIMEOUT);
} }
void f2fs_init_ckpt_req_control(struct f2fs_sb_info *sbi) void f2fs_init_ckpt_req_control(struct f2fs_sb_info *sbi)

1
fs/f2fs/f2fs.h
View File

@@ -3626,6 +3626,7 @@ unsigned int f2fs_usable_blks_in_seg(struct f2fs_sb_info *sbi,
* checkpoint.c * checkpoint.c
*/ */
void f2fs_stop_checkpoint(struct f2fs_sb_info *sbi, bool end_io); void f2fs_stop_checkpoint(struct f2fs_sb_info *sbi, bool end_io);
void f2fs_flush_ckpt_thread(struct f2fs_sb_info *sbi);
struct page *f2fs_grab_meta_page(struct f2fs_sb_info *sbi, pgoff_t index); struct page *f2fs_grab_meta_page(struct f2fs_sb_info *sbi, pgoff_t index);
struct page *f2fs_get_meta_page(struct f2fs_sb_info *sbi, pgoff_t index); struct page *f2fs_get_meta_page(struct f2fs_sb_info *sbi, pgoff_t index);
struct page *f2fs_get_meta_page_retry(struct f2fs_sb_info *sbi, pgoff_t index); struct page *f2fs_get_meta_page_retry(struct f2fs_sb_info *sbi, pgoff_t index);

5
fs/f2fs/super.c
View File

@@ -1555,9 +1555,8 @@ static int f2fs_freeze(struct super_block *sb)
if (is_sbi_flag_set(F2FS_SB(sb), SBI_IS_DIRTY)) if (is_sbi_flag_set(F2FS_SB(sb), SBI_IS_DIRTY))
return -EINVAL; return -EINVAL;
/* ensure no checkpoint required */ /* Let's flush checkpoints and stop the thread. */
if (!llist_empty(&F2FS_SB(sb)->cprc_info.issue_list)) f2fs_flush_ckpt_thread(F2FS_SB(sb));
return -EINVAL;
/* to avoid deadlock on f2fs_evict_inode->SB_FREEZE_FS */ /* to avoid deadlock on f2fs_evict_inode->SB_FREEZE_FS */
set_sbi_flag(F2FS_SB(sb), SBI_IS_FREEZING); set_sbi_flag(F2FS_SB(sb), SBI_IS_FREEZING);