2 files changed, 22 insertions, 7 deletions

diff --git a/drivers/md/dm.c b/drivers/md/dm.c
index 141ff9fa296e..2120155929a6 100644
--- a/drivers/md/dm.c
+++ b/drivers/md/dm.c
@@ -580,8 +580,8 @@ static void __map_bio(struct dm_target *ti, struct bio *clone,
                 /* the bio has been remapped so dispatch it */
 
                 blk_add_trace_remap(bdev_get_queue(clone->bi_bdev), clone,
-                                    tio->io->bio->bi_bdev->bd_dev, sector,
-                                    clone->bi_sector);
+                                    tio->io->bio->bi_bdev->bd_dev,
+                                    clone->bi_sector, sector);
 
                 generic_make_request(clone);
         } else if (r < 0 || r == DM_MAPIO_REQUEUE) {
diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
index 650991bddd8e..f33a729960ca 100644
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@ -1972,7 +1972,8 @@ static int run(mddev_t *mddev)
                     !test_bit(In_sync, &disk->rdev->flags)) {
                         disk->head_position = 0;
                         mddev->degraded++;
-                        conf->fullsync = 1;
+                        if (disk->rdev)
+                                conf->fullsync = 1;
                 }
         }
         if (mddev->degraded == conf->raid_disks) {
@@ -2153,11 +2154,25 @@ static int raid1_reshape(mddev_t *mddev)
         oldpool = conf->r1bio_pool;
         conf->r1bio_pool = newpool;
 
-        for (d=d2=0; d < conf->raid_disks; d++)
-                if (conf->mirrors[d].rdev) {
-                        conf->mirrors[d].rdev->raid_disk = d2;
-                        newmirrors[d2++].rdev = conf->mirrors[d].rdev;
+        for (d = d2 = 0; d < conf->raid_disks; d++) {
+                mdk_rdev_t *rdev = conf->mirrors[d].rdev;
+                if (rdev && rdev->raid_disk != d2) {
+                        char nm[20];
+                        sprintf(nm, "rd%d", rdev->raid_disk);
+                        sysfs_remove_link(&mddev->kobj, nm);
+                        rdev->raid_disk = d2;
+                        sprintf(nm, "rd%d", rdev->raid_disk);
+                        sysfs_remove_link(&mddev->kobj, nm);
+                        if (sysfs_create_link(&mddev->kobj,
+                                              &rdev->kobj, nm))
+                                printk(KERN_WARNING
+                                       "md/raid1: cannot register "
+                                       "%s for %s\n",
+                                       nm, mdname(mddev));
                 }
+                if (rdev)
+                        newmirrors[d2++].rdev = rdev;
+        }
         kfree(conf->mirrors);
         conf->mirrors = newmirrors;
         kfree(conf->poolinfo);