Commit f5558be1 authored Nov 09, 2024 by Jens Axboe

Merge tag 'md-6.13-20241107' of...

Merge tag 'md-6.13-20241107' of https://git.kernel.org/pub/scm/linux/kernel/git/song/md into for-6.13/block

Pull raid5 fix from Song.

* tag 'md-6.13-20241107' of https://git.kernel.org/pub/scm/linux/kernel/git/song/md:
  MAINTAINERS: Make Yu Kuai co-maintainer of md/raid subsystem
  md/raid5: Wait sync io to finish before changing group cnt

parents 8e604cac c13c2d2a

MAINTAINERS

+1 −1

Original line number	Diff line number	Diff line
		@@ -21303,7 +21303,7 @@ F: include/linux/property.h

		SOFTWARE RAID (Multiple Disks) SUPPORT
		M: Song Liu <song@kernel.org>
		R: Yu Kuai <yukuai3@huawei.com>
		M: Yu Kuai <yukuai3@huawei.com>
		L: linux-raid@vger.kernel.org
		S: Supported
		Q: https://patchwork.kernel.org/project/linux-raid/list/

drivers/md/raid5.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -7176,6 +7176,8 @@ raid5_store_group_thread_cnt(struct mddev mddev, const char page, size_t len)
		err = mddev_suspend_and_lock(mddev);
		if (err)
		return err;
		raid5_quiesce(mddev, true);

		conf = mddev->private;
		if (!conf)
		err = -ENODEV;
		@@ -7197,6 +7199,8 @@ raid5_store_group_thread_cnt(struct mddev mddev, const char page, size_t len)
		kfree(old_groups);
		}
		}

		raid5_quiesce(mddev, false);
		mddev_unlock_and_resume(mddev);

		return err ?: len;