1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
index d38d235cc39d..23ac880bba9a 100644
--- a/drivers/md/raid5.c
+++ b/drivers/md/raid5.c
@@ -4842,7 +4842,7 @@ static struct r5conf *setup_conf(struct mddev *mddev)
 
         pr_debug("raid456: run(%s) called.\n", mdname(mddev));
 
-        list_for_each_entry(rdev, &mddev->disks, same_set) {
+        rdev_for_each(rdev, mddev) {
                 raid_disk = rdev->raid_disk;
                 if (raid_disk >= max_disks
                     || raid_disk < 0)
@@ -5177,7 +5177,7 @@ static int run(struct mddev *mddev)
                 blk_queue_io_opt(mddev->queue, chunk_size *
                                  (conf->raid_disks - conf->max_degraded));
 
-                list_for_each_entry(rdev, &mddev->disks, same_set)
+                rdev_for_each(rdev, mddev)
                         disk_stack_limits(mddev->gendisk, rdev->bdev,
                                           rdev->data_offset << 9);
         }
@@ -5500,7 +5500,7 @@ static int raid5_start_reshape(struct mddev *mddev)
         if (!check_stripe_cache(mddev))
                 return -ENOSPC;
 
-        list_for_each_entry(rdev, &mddev->disks, same_set)
+        rdev_for_each(rdev, mddev)
                 if (!test_bit(In_sync, &rdev->flags)
                     && !test_bit(Faulty, &rdev->flags))
                         spares++;
@@ -5546,7 +5546,7 @@ static int raid5_start_reshape(struct mddev *mddev)
          * such devices during the reshape and confusion could result.
          */
         if (mddev->delta_disks >= 0) {
-                list_for_each_entry(rdev, &mddev->disks, same_set)
+                rdev_for_each(rdev, mddev)
                         if (rdev->raid_disk < 0 &&
                             !test_bit(Faulty, &rdev->flags)) {
                                 if (raid5_add_disk(mddev, rdev) == 0) {