]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
md: Fix static checker warning in analyze_sbs
authorLi Nan <linan122@huawei.com>
Mon, 15 Dec 2025 12:44:12 +0000 (20:44 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 8 Jan 2026 09:14:37 +0000 (10:14 +0100)
[ Upstream commit 00f6c1b4d15d35fadb7f34768a1831c81aaa8936 ]

The following warn is reported:

 drivers/md/md.c:3912 analyze_sbs()
 warn: iterator 'i' not incremented

Fixes: d8730f0cf4ef ("md: Remove deprecated CONFIG_MD_MULTIPATH")
Reported-by: Dan Carpenter <dan.carpenter@linaro.org>
Closes: https://lore.kernel.org/linux-raid/7e2e95ce-3740-09d8-a561-af6bfb767f18@huaweicloud.com/T/#t
Signed-off-by: Li Nan <linan122@huawei.com>
Link: https://lore.kernel.org/linux-raid/20251215124412.4015572-1-linan666@huaweicloud.com
Signed-off-by: Yu Kuai <yukuai@fnnas.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/md/md.c

index 5c39246c467e3dedc22a0adcb4d7924930605e78..26056d53f40c9de2724e344341ade4613905a8e9 100644 (file)
@@ -3729,7 +3729,6 @@ out_free_rdev:
 
 static int analyze_sbs(struct mddev *mddev)
 {
-       int i;
        struct md_rdev *rdev, *freshest, *tmp;
 
        freshest = NULL;
@@ -3756,11 +3755,9 @@ static int analyze_sbs(struct mddev *mddev)
        super_types[mddev->major_version].
                validate_super(mddev, NULL/*freshest*/, freshest);
 
-       i = 0;
        rdev_for_each_safe(rdev, tmp, mddev) {
                if (mddev->max_disks &&
-                   (rdev->desc_nr >= mddev->max_disks ||
-                    i > mddev->max_disks)) {
+                   rdev->desc_nr >= mddev->max_disks) {
                        pr_warn("md: %s: %pg: only %d devices permitted\n",
                                mdname(mddev), rdev->bdev,
                                mddev->max_disks);