md: fix missing flush of sync_work

commit f2d87a759f6841a132e845e2fafdad37385ddd30 upstream.

Commit ac619781967b ("md: use separate work_struct for md_start_sync()")
use a new sync_work to replace del_work, however, stop_sync_thread() and
__md_stop_writes() was trying to wait for sync_thread to be done, hence
they should switch to use sync_work as well.

Noted that md_start_sync() from sync_work will grab 'reconfig_mutex',
hence other contex can't held the same lock to flush work, and this will
be fixed in later patches.

Fixes: ac619781967b ("md: use separate work_struct for md_start_sync()")
Signed-off-by: Yu Kuai <yukuai3@huawei.com>
Acked-by: Xiao Ni <xni@redhat.com>
Signed-off-by: Song Liu <song@kernel.org>
Link: https://lore.kernel.org/r/20231205094215.1824240-2-yukuai1@huaweicloud.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/md/md.c b/drivers/md/md.c
index 534c4efd935f6cb97aaa01ebecfda859dfcc046c..240e12cfd17f1a68649cccf3cc39e7e2067908b3 100644 (file)
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -4836,7 +4836,7 @@ static void stop_sync_thread(struct mddev *mddev)
                return;
        }
 
-       if (work_pending(&mddev->del_work))
+       if (work_pending(&mddev->sync_work))
                flush_workqueue(md_misc_wq);
 
        set_bit(MD_RECOVERY_INTR, &mddev->recovery);
@@ -6293,7 +6293,7 @@ static void md_clean(struct mddev *mddev)
 static void __md_stop_writes(struct mddev *mddev)
 {
        set_bit(MD_RECOVERY_FROZEN, &mddev->recovery);
-       if (work_pending(&mddev->del_work))
+       if (work_pending(&mddev->sync_work))
                flush_workqueue(md_misc_wq);
        if (mddev->sync_thread) {
                set_bit(MD_RECOVERY_INTR, &mddev->recovery);