Merge branches 'topic/asoc', 'topic/misc-fixes', 'topic/ps3-csbits' and 'topic/stagin...

[linux-2.6-omap-h63xx.git] / drivers / md / dm-raid1.c

diff --git a/drivers/md/dm-raid1.c b/drivers/md/dm-raid1.c
index ff05fe89308313ab5792a6b3dc9146db3e585c6a..29913e42c4ab436da84fc7fdf6e42da4fe051e49 100644 (file)
--- a/drivers/md/dm-raid1.c
+++ b/drivers/md/dm-raid1.c
@@ -842,7 +842,9 @@ static int recover(struct mirror_set *ms, struct region *reg)
        }
 
        /* hand to kcopyd */
-       set_bit(DM_KCOPYD_IGNORE_ERROR, &flags);
+       if (!errors_handled(ms))
+               set_bit(DM_KCOPYD_IGNORE_ERROR, &flags);
+
        r = dm_kcopyd_copy(ms->kcopyd_client, &from, ms->nr_mirrors - 1, to,
                           flags, recovery_complete, reg);