Skip to content

Commit 892da88

Browse files
YuKuai-huaweiliu-song-6
authored andcommitted
md/raid10: fix a 'conf->barrier' leakage in raid10_takeover()
After commit b39f35e ("md: don't quiesce in mddev_suspend()"), 'conf->barrier' will be leaked in the case that raid10 takeover raid0: level_store pers->takeover -> raid10_takeover raid10_takeover_raid0 WRITE_ONCE(conf->barrier, 1) mddev_suspend // still raid0 mddev->pers = pers // switch to raid10 mddev_resume // resume without suspend After the above commit, mddev_resume() will not decrease 'conf->barrier' that is set in raid10_takeover_raid0(). Fix this problem by not setting 'conf->barrier' in raid10_takeover_raid0(). By the way, this problem is found while I'm trying to make mddev_suspend/resume() to be independent from raid personalities. raid10 is the only personality to use reference count in the quiesce() callback and this problem is only related to raid10. Fixes: b39f35e ("md: don't quiesce in mddev_suspend()") Signed-off-by: Yu Kuai <[email protected]> Reviewed-by: Paul Menzel <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Song Liu <[email protected]>
1 parent 8b0472b commit 892da88

File tree

1 file changed

+0
-1
lines changed

1 file changed

+0
-1
lines changed

drivers/md/raid10.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4417,7 +4417,6 @@ static void *raid10_takeover_raid0(struct mddev *mddev, sector_t size, int devs)
44174417
rdev->new_raid_disk = rdev->raid_disk * 2;
44184418
rdev->sectors = size;
44194419
}
4420-
WRITE_ONCE(conf->barrier, 1);
44214420
}
44224421

44234422
return conf;

0 commit comments

Comments
 (0)