Commit 26bc4f01 authored by Jens Axboe's avatar Jens Axboe
Browse files

Merge branch 'md-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/song/md into block-5.16 

Pull MD fix from Song, fixing a raid1 regression with missing bitmap
updates.

* 'md-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/song/md:
  md/raid1: fix missing bitmap update w/o WriteMostly devices
parents 87959fa1 46669e86

drivers/md/raid1.c

+2 −1
Original line number Diff line number Diff line
@@ -1496,12 +1496,13 @@ static void raid1_write_request(struct mddev *mddev, struct bio *bio, 
		if (!r1_bio->bios[i])

			continue;



		if (first_clone && test_bit(WriteMostly, &rdev->flags)) {

		if (first_clone) {

			/* do behind I/O ?

			 * Not if there are too many, or cannot

			 * allocate memory, or a reader on WriteMostly

			 * is waiting for behind writes to flush */

			if (bitmap &&

			    test_bit(WriteMostly, &rdev->flags) &&

			    (atomic_read(&bitmap->behind_writes)

			     < mddev->bitmap_info.max_write_behind) &&

			    !waitqueue_active(&bitmap->behind_wait)) {