Skip to content

Commit f5558be

Browse files
committed
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
2 parents 8e604ca + c13c2d2 commit f5558be

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

MAINTAINERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21303,7 +21303,7 @@ F: include/linux/property.h
2130321303

2130421304
SOFTWARE RAID (Multiple Disks) SUPPORT
2130521305
M: Song Liu <[email protected]>
21306-
R: Yu Kuai <[email protected]>
21306+
M: Yu Kuai <[email protected]>
2130721307
2130821308
S: Supported
2130921309
Q: https://patchwork.kernel.org/project/linux-raid/list/

drivers/md/raid5.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7176,6 +7176,8 @@ raid5_store_group_thread_cnt(struct mddev *mddev, const char *page, size_t len)
71767176
err = mddev_suspend_and_lock(mddev);
71777177
if (err)
71787178
return err;
7179+
raid5_quiesce(mddev, true);
7180+
71797181
conf = mddev->private;
71807182
if (!conf)
71817183
err = -ENODEV;
@@ -7197,6 +7199,8 @@ raid5_store_group_thread_cnt(struct mddev *mddev, const char *page, size_t len)
71977199
kfree(old_groups);
71987200
}
71997201
}
7202+
7203+
raid5_quiesce(mddev, false);
72007204
mddev_unlock_and_resume(mddev);
72017205

72027206
return err ?: len;

0 commit comments

Comments
 (0)