lkml.org 
[lkml]   [2022]   [Oct]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 6.0 125/862] f2fs: flush pending checkpoints when freezing super
    Date
    From: Jaegeuk Kim <jaegeuk@kernel.org>

    commit c7b58576370147833999fd4cc874d0f918bdf9ca upstream.

    This avoids -EINVAL when trying to freeze f2fs.

    Cc: stable@vger.kernel.org
    Reviewed-by: Chao Yu <chao@kernel.org>
    Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    fs/f2fs/checkpoint.c | 24 ++++++++++++++++++------
    fs/f2fs/f2fs.h | 1 +
    fs/f2fs/super.c | 5 ++---
    3 files changed, 21 insertions(+), 9 deletions(-)

    --- a/fs/f2fs/checkpoint.c
    +++ b/fs/f2fs/checkpoint.c
    @@ -1892,15 +1892,27 @@ int f2fs_start_ckpt_thread(struct f2fs_s
    void f2fs_stop_ckpt_thread(struct f2fs_sb_info *sbi)
    {
    struct ckpt_req_control *cprc = &sbi->cprc_info;
    + struct task_struct *ckpt_task;

    - if (cprc->f2fs_issue_ckpt) {
    - struct task_struct *ckpt_task = cprc->f2fs_issue_ckpt;
    + if (!cprc->f2fs_issue_ckpt)
    + return;

    - cprc->f2fs_issue_ckpt = NULL;
    - kthread_stop(ckpt_task);
    + ckpt_task = cprc->f2fs_issue_ckpt;
    + cprc->f2fs_issue_ckpt = NULL;
    + kthread_stop(ckpt_task);

    - flush_remained_ckpt_reqs(sbi, NULL);
    - }
    + 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);
    +
    + /* 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)
    --- a/fs/f2fs/f2fs.h
    +++ b/fs/f2fs/f2fs.h
    @@ -3707,6 +3707,7 @@ static inline bool f2fs_need_rand_seg(st
    * checkpoint.c
    */
    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_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);
    --- a/fs/f2fs/super.c
    +++ b/fs/f2fs/super.c
    @@ -1666,9 +1666,8 @@ static int f2fs_freeze(struct super_bloc
    if (is_sbi_flag_set(F2FS_SB(sb), SBI_IS_DIRTY))
    return -EINVAL;

    - /* ensure no checkpoint required */
    - if (!llist_empty(&F2FS_SB(sb)->cprc_info.issue_list))
    - return -EINVAL;
    + /* Let's flush checkpoints and stop the thread. */
    + f2fs_flush_ckpt_thread(F2FS_SB(sb));

    /* to avoid deadlock on f2fs_evict_inode->SB_FREEZE_FS */
    set_sbi_flag(F2FS_SB(sb), SBI_IS_FREEZING);

    \
     
     \ /
      Last update: 2022-10-19 10:47    [W:4.018 / U:2.152 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site