diff options
author | Yu Kuai <yukuai3@huawei.com> | 2024-03-05 15:22:58 +0800 |
---|---|---|
committer | Song Liu <song@kernel.org> | 2024-03-05 12:53:32 -0800 |
commit | 2f03d0c2cd451c7ac2f317079d4ec518f0986b55 (patch) | |
tree | ad0b4a8d2ac313457a555da4667b27a10222726c /drivers/md/md.c | |
parent | 268283244c0f018dec8bf4a9c69ce50684561f46 (diff) | |
download | linux-2f03d0c2cd451c7ac2f317079d4ec518f0986b55.tar.gz linux-2f03d0c2cd451c7ac2f317079d4ec518f0986b55.tar.bz2 linux-2f03d0c2cd451c7ac2f317079d4ec518f0986b55.zip |
md: don't clear MD_RECOVERY_FROZEN for new dm-raid until resume
After commit 9dbd1aa3a81c ("dm raid: add reshaping support to the
target") raid_ctr() will set MD_RECOVERY_FROZEN before md_run() and
expect to keep array frozen until resume. However, md_run() will clear
the flag by setting mddev->recovery to 0.
Before commit 1baae052cccd ("md: Don't ignore suspended array in
md_check_recovery()"), dm-raid actually relied on suspending to prevent
starting new sync_thread.
Fix this problem by keeping 'MD_RECOVERY_FROZEN' for dm-raid in
md_run().
Fixes: 1baae052cccd ("md: Don't ignore suspended array in md_check_recovery()")
Fixes: 9dbd1aa3a81c ("dm raid: add reshaping support to the target")
Cc: stable@vger.kernel.org # v6.7+
Signed-off-by: Yu Kuai <yukuai3@huawei.com>
Signed-off-by: Xiao Ni <xni@redhat.com>
Acked-by: Mike Snitzer <snitzer@kernel.org>
Signed-off-by: Song Liu <song@kernel.org>
Link: https://lore.kernel.org/r/20240305072306.2562024-2-yukuai1@huaweicloud.com
Diffstat (limited to 'drivers/md/md.c')
-rw-r--r-- | drivers/md/md.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/md/md.c b/drivers/md/md.c index 48ae2b1cb57a..0c4e00e8d485 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c @@ -6062,7 +6062,10 @@ int md_run(struct mddev *mddev) pr_warn("True protection against single-disk failure might be compromised.\n"); } - mddev->recovery = 0; + /* dm-raid expect sync_thread to be frozen until resume */ + if (mddev->gendisk) + mddev->recovery = 0; + /* may be over-ridden by personality */ mddev->resync_max_sectors = mddev->dev_sectors; |