From: Jonathan Brassow Date: Mon, 26 Jun 2006 07:27:30 +0000 (-0700) Subject: [PATCH] dm kcopyd: error accumulation fix X-Git-Tag: v2.6.18-rc1~655 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ce503f59ae899c3e75a8a1cf46f2d44c0c5b5c7c;p=profile%2Fivi%2Fkernel-x86-ivi.git [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 Signed-off-by: Alasdair G Kergon Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/drivers/md/dm-raid1.c b/drivers/md/dm-raid1.c index 84f2ed6..6ae42f1 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 72480a4..73ab875 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.