---

yaml --- r: 110628 b: refs/heads/master c: f7c83e2 h: refs/heads/master v: v3
git-mirror · Oct 10, 2008 · 7eade6a · 7eade6a
1 parent 643842a
commit 7eade6a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -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);