aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Brassow <jbrassow@redhat.com>2006-06-26 00:27:30 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-06-26 09:58:35 -0700
commitce503f59ae899c3e75a8a1cf46f2d44c0c5b5c7c (patch)
tree7bec805d077c3a7f47f7a1965a1a8020082c5544
parent8a835f11bce68ed990533e49b5dedb00bee46d71 (diff)
downloadmrst-s0i3-test-ce503f59ae899c3e75a8a1cf46f2d44c0c5b5c7c.tar.gz
mrst-s0i3-test-ce503f59ae899c3e75a8a1cf46f2d44c0c5b5c7c.tar.xz
mrst-s0i3-test-ce503f59ae899c3e75a8a1cf46f2d44c0c5b5c7c.zip
[PATCH] dm kcopyd: error accumulation fix
kcopyd should accumulate errors - otherwise I/O failures may be ignored unintentionally. And invert 'success' (used in a future patch), using a more intuitive !(read_err || write_err). Signed-off-by: Jonathan Brassow <jbrassow@redhat.com> Signed-off-by: Alasdair G Kergon <agk@redhat.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--drivers/md/dm-raid1.c2
-rw-r--r--drivers/md/kcopyd.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/md/dm-raid1.c b/drivers/md/dm-raid1.c
index 84f2ed6d9c5..6ae42f1d76a 100644
--- a/drivers/md/dm-raid1.c
+++ b/drivers/md/dm-raid1.c
@@ -602,7 +602,7 @@ static void recovery_complete(int read_err, unsigned int write_err,
struct region *reg = (struct region *) context;
/* FIXME: better error handling */
- rh_recovery_end(reg, read_err || write_err);
+ rh_recovery_end(reg, !(read_err || write_err));
}
static int recover(struct mirror_set *ms, struct region *reg)
diff --git a/drivers/md/kcopyd.c b/drivers/md/kcopyd.c
index 72480a48d88..73ab875fb15 100644
--- a/drivers/md/kcopyd.c
+++ b/drivers/md/kcopyd.c
@@ -314,7 +314,7 @@ static void complete_io(unsigned long error, void *context)
if (error) {
if (job->rw == WRITE)
- job->write_err &= error;
+ job->write_err |= error;
else
job->read_err = 1;
@@ -460,7 +460,7 @@ static void segment_complete(int read_err,
job->read_err = 1;
if (write_err)
- job->write_err &= write_err;
+ job->write_err |= write_err;
/*
* Only dispatch more work if there hasn't been an error.