summaryrefslogtreecommitdiffstats
path: root/drivers/md/raid1.c
diff options
context:
space:
mode:
authorNeilBrown <neilb@suse.de>2012-03-18 21:46:39 -0400
committerNeilBrown <neilb@suse.de>2012-03-18 21:46:39 -0400
commitdafb20fa34320a472deb7442f25a0c086e0feb33 (patch)
tree2ff501805f8a6d08119f1f1a7248f579d52e491b /drivers/md/raid1.c
parentd6b42dcb995e6acd7cc276774e751ffc9f0ef4bf (diff)
md: tidy up rdev_for_each usage.
md.h has an 'rdev_for_each()' macro for iterating the rdevs in an mddev. However it uses the 'safe' version of list_for_each_entry, and so requires the extra variable, but doesn't include 'safe' in the name, which is useful documentation. Consequently some places use this safe version without needing it, and many use an explicity list_for_each entry. So: - rename rdev_for_each to rdev_for_each_safe - create a new rdev_for_each which uses the plain list_for_each_entry, - use the 'safe' version only where needed, and convert all other list_for_each_entry calls to use rdev_for_each. Signed-off-by: NeilBrown <neilb@suse.de>
Diffstat (limited to 'drivers/md/raid1.c')
-rw-r--r--drivers/md/raid1.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
index 118e0f69f224..a933bd4065a5 100644
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@ -2504,7 +2504,7 @@ static struct r1conf *setup_conf(struct mddev *mddev)
2504 2504
2505 err = -EINVAL; 2505 err = -EINVAL;
2506 spin_lock_init(&conf->device_lock); 2506 spin_lock_init(&conf->device_lock);
2507 list_for_each_entry(rdev, &mddev->disks, same_set) { 2507 rdev_for_each(rdev, mddev) {
2508 int disk_idx = rdev->raid_disk; 2508 int disk_idx = rdev->raid_disk;
2509 if (disk_idx >= mddev->raid_disks 2509 if (disk_idx >= mddev->raid_disks
2510 || disk_idx < 0) 2510 || disk_idx < 0)
@@ -2622,7 +2622,7 @@ static int run(struct mddev *mddev)
2622 if (IS_ERR(conf)) 2622 if (IS_ERR(conf))
2623 return PTR_ERR(conf); 2623 return PTR_ERR(conf);
2624 2624
2625 list_for_each_entry(rdev, &mddev->disks, same_set) { 2625 rdev_for_each(rdev, mddev) {
2626 if (!mddev->gendisk) 2626 if (!mddev->gendisk)
2627 continue; 2627 continue;
2628 disk_stack_limits(mddev->gendisk, rdev->bdev, 2628 disk_stack_limits(mddev->gendisk, rdev->bdev,