Commit 743bf030 authored by Jens Axboe's avatar Jens Axboe
Browse files

Merge tag 'md-6.17-20250905' of... 

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
parents 1f6b281a 7202082b

drivers/md/md.c

+5 −0
Original line number Diff line number Diff line
@@ -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;

drivers/md/raid1.c

+1 −1
Original line number Diff line number Diff line
@@ -1225,7 +1225,7 @@ static void alloc_behind_master_bio(struct r1bio *r1_bio, 
	int i = 0;

	struct bio *behind_bio = NULL;



	behind_bio = bio_alloc_bioset(NULL, vcnt, 0, GFP_NOIO,

	behind_bio = bio_alloc_bioset(NULL, vcnt, bio->bi_opf, GFP_NOIO,

				      &r1_bio->mddev->bio_set);



	/* discard op, we don't support writezero/writesame yet */