From 7eade6af25cec800282702af4507fd8bbc4286f3 Mon Sep 17 00:00:00 2001
From: Jonathan Brassow <jbrassow@redhat.com>
Date: Fri, 10 Oct 2008 13:36:59 +0100
Subject: [PATCH] --- yaml --- r: 110628 b: refs/heads/master c:
 f7c83e2e4783c4f7abe6f3a85a8c5e210f98bc7b h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/md/dm-raid1.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 91169d15e1cd..f585556b016d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6680073d3ec7c6dbdbf77870bf1fea869767d779
+refs/heads/master: f7c83e2e4783c4f7abe6f3a85a8c5e210f98bc7b
diff --git a/trunk/drivers/md/dm-raid1.c b/trunk/drivers/md/dm-raid1.c
index ff05fe893083..29913e42c4ab 100644
--- a/trunk/drivers/md/dm-raid1.c
+++ b/trunk/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);