2 files changed, 9 insertions, 12 deletions

diff --git a/drivers/md/md.c b/drivers/md/md.c
index b182f86a19dd..5f154ef1e4be 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -98,44 +98,40 @@ static struct ctl_table_header *raid_table_header;
 
 static ctl_table raid_table[] = {
         {
-                .ctl_name       = DEV_RAID_SPEED_LIMIT_MIN,
                 .procname       = "speed_limit_min",
                 .data           = &sysctl_speed_limit_min,
                 .maxlen         = sizeof(int),
                 .mode           = S_IRUGO|S_IWUSR,
-                .proc_handler   = &proc_dointvec,
+                .proc_handler   = proc_dointvec,
         },
         {
-                .ctl_name       = DEV_RAID_SPEED_LIMIT_MAX,
                 .procname       = "speed_limit_max",
                 .data           = &sysctl_speed_limit_max,
                 .maxlen         = sizeof(int),
                 .mode           = S_IRUGO|S_IWUSR,
-                .proc_handler   = &proc_dointvec,
+                .proc_handler   = proc_dointvec,
         },
-        { .ctl_name = 0 }
+        { }
 };
 
 static ctl_table raid_dir_table[] = {
         {
-                .ctl_name       = DEV_RAID,
                 .procname       = "raid",
                 .maxlen         = 0,
                 .mode           = S_IRUGO|S_IXUGO,
                 .child          = raid_table,
         },
-        { .ctl_name = 0 }
+        { }
 };
 
 static ctl_table raid_root_table[] = {
         {
-                .ctl_name       = CTL_DEV,
                 .procname       = "dev",
                 .maxlen         = 0,
                 .mode           = 0555,
                 .child          = raid_dir_table,
         },
-        { .ctl_name = 0 }
+        {  }
 };
 
 static const struct block_device_operations md_fops;
diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
index a053423785c9..e07ce2e033a9 100644
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@ -1650,11 +1650,12 @@ static void raid1d(mddev_t *mddev)
                                                r1_bio->sector,
                                                r1_bio->sectors);
                                 unfreeze_array(conf);
-                        }
+                        } else
+                                md_error(mddev,
+                                         conf->mirrors[r1_bio->read_disk].rdev);
 
                         bio = r1_bio->bios[r1_bio->read_disk];
-                        if ((disk=read_balance(conf, r1_bio)) == -1 ||
-                            disk == r1_bio->read_disk) {
+                        if ((disk=read_balance(conf, r1_bio)) == -1) {
                                 printk(KERN_ALERT "raid1: %s: unrecoverable I/O"
                                        " read error for block %llu\n",
                                        bdevname(bio->bi_bdev,b),