Commit 29ac4aa3 authored by NeilBrown's avatar NeilBrown Committed by Linus Torvalds

md: change INTERATE_MDDEV to for_each_mddev

As this is more consistent with kernel style.
Signed-off-by: default avatarNeil Brown <neilb@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 20a49ff6
...@@ -195,7 +195,7 @@ static DEFINE_SPINLOCK(all_mddevs_lock); ...@@ -195,7 +195,7 @@ static DEFINE_SPINLOCK(all_mddevs_lock);
* Any code which breaks out of this loop while own * Any code which breaks out of this loop while own
* a reference to the current mddev and must mddev_put it. * a reference to the current mddev and must mddev_put it.
*/ */
#define ITERATE_MDDEV(mddev,tmp) \ #define for_each_mddev(mddev,tmp) \
\ \
for (({ spin_lock(&all_mddevs_lock); \ for (({ spin_lock(&all_mddevs_lock); \
tmp = all_mddevs.next; \ tmp = all_mddevs.next; \
...@@ -1594,7 +1594,7 @@ static void md_print_devices(void) ...@@ -1594,7 +1594,7 @@ static void md_print_devices(void)
printk("md: **********************************\n"); printk("md: **********************************\n");
printk("md: * <COMPLETE RAID STATE PRINTOUT> *\n"); printk("md: * <COMPLETE RAID STATE PRINTOUT> *\n");
printk("md: **********************************\n"); printk("md: **********************************\n");
ITERATE_MDDEV(mddev,tmp) { for_each_mddev(mddev, tmp) {
if (mddev->bitmap) if (mddev->bitmap)
bitmap_print_sb(mddev->bitmap); bitmap_print_sb(mddev->bitmap);
...@@ -2012,7 +2012,7 @@ rdev_size_store(mdk_rdev_t *rdev, const char *buf, size_t len) ...@@ -2012,7 +2012,7 @@ rdev_size_store(mdk_rdev_t *rdev, const char *buf, size_t len)
struct list_head *tmp, *tmp2; struct list_head *tmp, *tmp2;
mddev_unlock(rdev->mddev); mddev_unlock(rdev->mddev);
ITERATE_MDDEV(mddev, tmp) { for_each_mddev(mddev, tmp) {
mdk_rdev_t *rdev2; mdk_rdev_t *rdev2;
mddev_lock(mddev); mddev_lock(mddev);
...@@ -5465,7 +5465,7 @@ void md_do_sync(mddev_t *mddev) ...@@ -5465,7 +5465,7 @@ void md_do_sync(mddev_t *mddev)
set_bit(MD_RECOVERY_INTR, &mddev->recovery); set_bit(MD_RECOVERY_INTR, &mddev->recovery);
goto skip; goto skip;
} }
ITERATE_MDDEV(mddev2,tmp) { for_each_mddev(mddev2, tmp) {
if (mddev2 == mddev) if (mddev2 == mddev)
continue; continue;
if (mddev2->curr_resync && if (mddev2->curr_resync &&
...@@ -5913,7 +5913,7 @@ static int md_notify_reboot(struct notifier_block *this, ...@@ -5913,7 +5913,7 @@ static int md_notify_reboot(struct notifier_block *this,
printk(KERN_INFO "md: stopping all md devices.\n"); printk(KERN_INFO "md: stopping all md devices.\n");
ITERATE_MDDEV(mddev,tmp) for_each_mddev(mddev, tmp)
if (mddev_trylock(mddev)) { if (mddev_trylock(mddev)) {
do_md_stop (mddev, 1); do_md_stop (mddev, 1);
mddev_unlock(mddev); mddev_unlock(mddev);
...@@ -6047,7 +6047,7 @@ static __exit void md_exit(void) ...@@ -6047,7 +6047,7 @@ static __exit void md_exit(void)
unregister_reboot_notifier(&md_notifier); unregister_reboot_notifier(&md_notifier);
unregister_sysctl_table(raid_table_header); unregister_sysctl_table(raid_table_header);
remove_proc_entry("mdstat", NULL); remove_proc_entry("mdstat", NULL);
ITERATE_MDDEV(mddev,tmp) { for_each_mddev(mddev, tmp) {
struct gendisk *disk = mddev->gendisk; struct gendisk *disk = mddev->gendisk;
if (!disk) if (!disk)
continue; continue;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment