scsi: use non-racy method for proc entries creation

[linux-2.6] / drivers / md / multipath.c

diff --git a/drivers/md/multipath.c b/drivers/md/multipath.c
index eb631ebed6860b3f19ae8c3161a10e509d448d3e..42ee1a2dc144fc88954c45a3509903633f00028e 100644 (file)
--- a/drivers/md/multipath.c
+++ b/drivers/md/multipath.c
@@ -244,7 +244,8 @@ static void multipath_error (mddev_t *mddev, mdk_rdev_t *rdev)
                        conf->working_disks--;
                        mddev->degraded++;
                        printk(KERN_ALERT "multipath: IO failure on %s,"
-                               " disabling IO path. \n Operation continuing"
+                               " disabling IO path.\n"
+                               "multipath: Operation continuing"
                                " on %d IO paths.\n",
                                bdevname (rdev->bdev,b),
                                conf->working_disks);
@@ -436,7 +437,7 @@ static int multipath_run (mddev_t *mddev)
        }
 
        conf->working_disks = 0;
-       ITERATE_RDEV(mddev,rdev,tmp) {
+       rdev_for_each(rdev, tmp, mddev) {
                disk_idx = rdev->raid_disk;
                if (disk_idx < 0 ||
                    disk_idx >= mddev->raid_disks)