diff --git a/[refs] b/[refs] index 4c5de5a984af..e1a0ddaa1697 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1e3fa9bd5061778fb5cf4648e4e8321e8cbbb95b +refs/heads/master: 547414d19fd72376ff2ecc42aac8d7a051f03d26 diff --git a/trunk/drivers/md/raid10.c b/trunk/drivers/md/raid10.c index 58c44d6453a0..1a19c962f860 100644 --- a/trunk/drivers/md/raid10.c +++ b/trunk/drivers/md/raid10.c @@ -1682,10 +1682,8 @@ static void end_sync_write(struct bio *bio, int error) d = find_bio_disk(conf, r10_bio, bio, &slot, &repl); if (repl) rdev = conf->mirrors[d].replacement; - if (!rdev) { - smp_mb(); + else rdev = conf->mirrors[d].rdev; - } if (!uptodate) { if (repl)