diff options
| author | Jens Axboe <axboe@kernel.dk> | 2025-09-05 14:08:27 +0300 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2025-09-05 14:08:27 +0300 |
| commit | 743bf030947169c413a711f60cebe73f837e649f (patch) | |
| tree | e0113ac9d4079b77358225e90e7c8ec55426bf0b /drivers/md/md.c | |
| parent | 1f6b281ac501ceaa121a9bece11260aecca70865 (diff) | |
| parent | 7202082b7b7a256d04ec96131c7f859df0a79f64 (diff) | |
| download | linux-743bf030947169c413a711f60cebe73f837e649f.tar.xz | |
Merge tag 'md-6.17-20250905' of https://git.kernel.org/pub/scm/linux/kernel/git/mdraid/linux into block-6.17
Pull MD fixes from Yu:
"- fix data loss for writemostly in raid1, by Yu Kuai;
- fix potentional data lost by skipping recovery, by Li Nan;"
* tag 'md-6.17-20250905' of https://git.kernel.org/pub/scm/linux/kernel/git/mdraid/linux:
md: prevent incorrect update of resync/recovery offset
md/raid1: fix data lost for writemostly rdev
Diffstat (limited to 'drivers/md/md.c')
| -rw-r--r-- | drivers/md/md.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/md/md.c b/drivers/md/md.c index 1baaf52c603c..4e033c26fdd4 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c @@ -9125,6 +9125,11 @@ void md_do_sync(struct md_thread *thread) } action = md_sync_action(mddev); + if (action == ACTION_FROZEN || action == ACTION_IDLE) { + set_bit(MD_RECOVERY_INTR, &mddev->recovery); + goto skip; + } + desc = md_sync_action_name(action); mddev->last_sync_action = action; |