aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/md/raid5.c
diff options
context:
space:
mode:
authorNeilBrown <neilb@suse.de>2008-02-06 04:39:59 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-06 13:41:19 -0500
commitd089c6af10c2be5988f03667d6d22fe6085fbe5e (patch)
tree815eb0596bd7c908f30c268da6b5c5eff0e0bc21 /drivers/md/raid5.c
parent29ac4aa3fc68a86279aca50f20df4d614de2e204 (diff)
md: change ITERATE_RDEV to rdev_for_each
As this is more in line with common practice in the kernel. Also swap the args around to be more like list_for_each. Signed-off-by: Neil Brown <neilb@suse.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/md/raid5.c')
-rw-r--r--drivers/md/raid5.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
index e946de6f46bc..63bfb0757829 100644
--- a/drivers/md/raid5.c
+++ b/drivers/md/raid5.c
@@ -4136,7 +4136,7 @@ static int run(mddev_t *mddev)
4136 4136
4137 pr_debug("raid5: run(%s) called.\n", mdname(mddev)); 4137 pr_debug("raid5: run(%s) called.\n", mdname(mddev));
4138 4138
4139 ITERATE_RDEV(mddev,rdev,tmp) { 4139 rdev_for_each(rdev, tmp, mddev) {
4140 raid_disk = rdev->raid_disk; 4140 raid_disk = rdev->raid_disk;
4141 if (raid_disk >= conf->raid_disks 4141 if (raid_disk >= conf->raid_disks
4142 || raid_disk < 0) 4142 || raid_disk < 0)
@@ -4549,7 +4549,7 @@ static int raid5_start_reshape(mddev_t *mddev)
4549 if (test_bit(MD_RECOVERY_RUNNING, &mddev->recovery)) 4549 if (test_bit(MD_RECOVERY_RUNNING, &mddev->recovery))
4550 return -EBUSY; 4550 return -EBUSY;
4551 4551
4552 ITERATE_RDEV(mddev, rdev, rtmp) 4552 rdev_for_each(rdev, rtmp, mddev)
4553 if (rdev->raid_disk < 0 && 4553 if (rdev->raid_disk < 0 &&
4554 !test_bit(Faulty, &rdev->flags)) 4554 !test_bit(Faulty, &rdev->flags))
4555 spares++; 4555 spares++;
@@ -4571,7 +4571,7 @@ static int raid5_start_reshape(mddev_t *mddev)
4571 /* Add some new drives, as many as will fit. 4571 /* Add some new drives, as many as will fit.
4572 * We know there are enough to make the newly sized array work. 4572 * We know there are enough to make the newly sized array work.
4573 */ 4573 */
4574 ITERATE_RDEV(mddev, rdev, rtmp) 4574 rdev_for_each(rdev, rtmp, mddev)
4575 if (rdev->raid_disk < 0 && 4575 if (rdev->raid_disk < 0 &&
4576 !test_bit(Faulty, &rdev->flags)) { 4576 !test_bit(Faulty, &rdev->flags)) {
4577 if (raid5_add_disk(mddev, rdev)) { 4577 if (raid5_add_disk(mddev, rdev)) {