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 <[email protected]>
Signed-off-by: Song Liu <[email protected]>
Link: https://lore.kernel.org/r/[email protected]

diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
index 4b30a174216232564cd88781d603d6ac5d7e5c95..2aabac773fe72aa0db6bb6344e128b3d3dd08460 100644 (file)
--- 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 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;
 
 
        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;
 
        if (rdev != p->rdev)
                p = conf->mirrors + conf->raid_disks + number;