From: Nigel Croxon Date: Mon, 11 Sep 2023 21:25:23 +0000 (-0700) Subject: md/raid1: fix error: ISO C90 forbids mixed declarations X-Git-Tag: v6.6.7~1666^2~9^2~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=df203da47f4428bc286fc99318936416253a321c;p=platform%2Fkernel%2Flinux-starfive.git md/raid1: fix error: ISO C90 forbids mixed declarations There is a compile error when this commit is added: md: raid1: fix potential OOB in raid1_remove_disk() drivers/md/raid1.c: In function 'raid1_remove_disk': drivers/md/raid1.c:1844:9: error: ISO C90 forbids mixed declarations and code [-Werror=declaration-after-statement] 1844 |         struct raid1_info *p = conf->mirrors + number;     |         ^~~~~~ That's because the new code was inserted before the struct. The change is move the struct command above this commit. Fixes: 8b0472b50bcf ("md: raid1: fix potential OOB in raid1_remove_disk()") Signed-off-by: Nigel Croxon Signed-off-by: Song Liu Link: https://lore.kernel.org/r/46d929d0-2aab-4cf2-b2bf-338963e8ba5a@redhat.com --- diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c index 4b30a17..2aabac7 100644 --- a/drivers/md/raid1.c +++ b/drivers/md/raid1.c @@ -1837,12 +1837,11 @@ static int raid1_remove_disk(struct mddev *mddev, struct md_rdev *rdev) struct r1conf *conf = mddev->private; int err = 0; int number = rdev->raid_disk; + struct raid1_info *p = conf->mirrors + number; if (unlikely(number >= conf->raid_disks)) goto abort; - struct raid1_info *p = conf->mirrors + number; - if (rdev != p->rdev) p = conf->mirrors + conf->raid_disks + number;