Commit b8417f72 authored by Jens Axboe's avatar Jens Axboe
Browse files

Merge branch 'md-next' of... 

Merge branch 'md-next' of https://git.kernel.org/pub/scm/linux/kernel/git/song/md into for-5.13/drivers

Pull MD fixes from Song.

* 'md-next' of https://git.kernel.org/pub/scm/linux/kernel/git/song/md:
  md/raid1: properly indicate failure when ending a failed write request
  md-cluster: fix use-after-free issue when removing rdev
parents 87d9ad02 2417b986

drivers/md/md.c

+4 −4
Original line number Diff line number Diff line
@@ -9289,11 +9289,11 @@ void md_check_recovery(struct mddev *mddev) 
		}



		if (mddev_is_clustered(mddev)) {

			struct md_rdev *rdev;

			struct md_rdev *rdev, *tmp;

			/* kick the device if another node issued a

			 * remove disk.

			 */

			rdev_for_each(rdev, mddev) {

			rdev_for_each_safe(rdev, tmp, mddev) {

				if (test_and_clear_bit(ClusterRemove, &rdev->flags) &&

						rdev->raid_disk < 0)

					md_kick_rdev_from_array(rdev);
@@ -9607,7 +9607,7 @@ static int __init md_init(void) 
static void check_sb_changes(struct mddev *mddev, struct md_rdev *rdev)

{

	struct mdp_superblock_1 *sb = page_address(rdev->sb_page);

	struct md_rdev *rdev2;

	struct md_rdev *rdev2, *tmp;

	int role, ret;

	char b[BDEVNAME_SIZE];
@@ -9624,7 +9624,7 @@ static void check_sb_changes(struct mddev *mddev, struct md_rdev *rdev) 
	}



	/* Check for change of roles in the active devices */

	rdev_for_each(rdev2, mddev) {

	rdev_for_each_safe(rdev2, tmp, mddev) {

		if (test_bit(Faulty, &rdev2->flags))

			continue;

drivers/md/raid1.c

+2 −0
Original line number Diff line number Diff line
@@ -478,6 +478,8 @@ static void raid1_end_write_request(struct bio *bio) 
		if (!test_bit(Faulty, &rdev->flags))

			set_bit(R1BIO_WriteError, &r1_bio->state);

		else {

			/* Fail the request */

			set_bit(R1BIO_Degraded, &r1_bio->state);

			/* Finished with this branch */

			r1_bio->bios[mirror] = NULL;

			to_put = bio;