f2fs: give up CP_TRIMMED_FLAG if it drops discards

[mirror_ubuntu-jammy-kernel.git] / fs / f2fs / segment.c

diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
index d6614037e04eb492eb8dce7f677a0ea7403ee4f1..bfbcff8339c5969f51de58f27c7bcb47d1184543 100644 (file)
--- a/fs/f2fs/segment.c
+++ b/fs/f2fs/segment.c
@@ -1196,12 +1196,13 @@ skip:
        return issued;
 }
 
-static void __drop_discard_cmd(struct f2fs_sb_info *sbi)
+static bool __drop_discard_cmd(struct f2fs_sb_info *sbi)
 {
        struct discard_cmd_control *dcc = SM_I(sbi)->dcc_info;
        struct list_head *pend_list;
        struct discard_cmd *dc, *tmp;
        int i;
+       bool dropped = false;
 
        mutex_lock(&dcc->cmd_lock);
        for (i = MAX_PLIST_NUM - 1; i >= 0; i--) {
@@ -1209,9 +1210,12 @@ static void __drop_discard_cmd(struct f2fs_sb_info *sbi)
                list_for_each_entry_safe(dc, tmp, pend_list, list) {
                        f2fs_bug_on(sbi, dc->state != D_PREP);
                        __remove_discard_cmd(sbi, dc);
+                       dropped = true;
                }
        }
        mutex_unlock(&dcc->cmd_lock);
+
+       return dropped;
 }
 
 static void __wait_one_discard_bio(struct f2fs_sb_info *sbi,
@@ -1306,15 +1310,18 @@ void stop_discard_thread(struct f2fs_sb_info *sbi)
 }
 
 /* This comes from f2fs_put_super */
-void f2fs_wait_discard_bios(struct f2fs_sb_info *sbi)
+bool f2fs_wait_discard_bios(struct f2fs_sb_info *sbi)
 {
        struct discard_cmd_control *dcc = SM_I(sbi)->dcc_info;
        struct discard_policy dpolicy;
+       bool dropped;
 
        init_discard_policy(&dpolicy, DPOLICY_UMOUNT, dcc->discard_granularity);
        __issue_discard_cmd(sbi, &dpolicy);
-       __drop_discard_cmd(sbi);
+       dropped = __drop_discard_cmd(sbi);
        __wait_all_discard_cmd(sbi, &dpolicy);
+
+       return dropped;
 }
 
 static int issue_discard_thread(void *data)