diff options
| author |   Jens Axboe <axboe@kernel.dk> | 2024-11-09 20:06:13 -0700 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2024-11-09 20:06:13 -0700 |
| commit | f5558be1ea9d19ab8c2d987d234b6d7912cd1ed6 (patch) | |
| tree | df8421d7dc273dcfb4ccc0c389f367af1421022a | |
| parent | loop: fix type of block size (diff) | |
| parent | MAINTAINERS: Make Yu Kuai co-maintainer of md/raid subsystem (diff) | |
| download | wireguard-linux-f5558be1ea9d19ab8c2d987d234b6d7912cd1ed6.tar.xz wireguard-linux-f5558be1ea9d19ab8c2d987d234b6d7912cd1ed6.zip | |
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
Diffstat (limited to '')
| -rw-r--r-- | MAINTAINERS | 2 | ||||
| -rw-r--r-- | drivers/md/raid5.c | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index e9659a5a7fb3..eeaa9f59dfe3 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -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/ diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c index f5ac81dd21b2..f09e7677ee9f 100644 --- a/drivers/md/raid5.c +++ b/drivers/md/raid5.c @@ -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; |