From 911ff6b3cf1ce61f8cb66f1382b6e3868098453f Mon Sep 17 00:00:00 2001 From: Jonathan Brassow Date: Mon, 26 Jun 2006 00:27:30 -0700 Subject: [PATCH] --- yaml --- r: 30348 b: refs/heads/master c: ce503f59ae899c3e75a8a1cf46f2d44c0c5b5c7c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/md/dm-raid1.c | 2 +- trunk/drivers/md/kcopyd.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 96776f2be59b..ab346163351b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8a835f11bce68ed990533e49b5dedb00bee46d71 +refs/heads/master: ce503f59ae899c3e75a8a1cf46f2d44c0c5b5c7c diff --git a/trunk/drivers/md/dm-raid1.c b/trunk/drivers/md/dm-raid1.c index 84f2ed6d9c5b..6ae42f1d76ae 100644 --- a/trunk/drivers/md/dm-raid1.c +++ b/trunk/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/trunk/drivers/md/kcopyd.c b/trunk/drivers/md/kcopyd.c index 72480a48d88b..73ab875fb158 100644 --- a/trunk/drivers/md/kcopyd.c +++ b/trunk/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.