diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/md/dm-raid1.c | 2 | ||||
-rw-r--r-- | drivers/md/kcopyd.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/md/dm-raid1.c b/drivers/md/dm-raid1.c index 84f2ed6d9c5b..6ae42f1d76ae 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, | |||
602 | struct region *reg = (struct region *) context; | 602 | struct region *reg = (struct region *) context; |
603 | 603 | ||
604 | /* FIXME: better error handling */ | 604 | /* FIXME: better error handling */ |
605 | rh_recovery_end(reg, read_err || write_err); | 605 | rh_recovery_end(reg, !(read_err || write_err)); |
606 | } | 606 | } |
607 | 607 | ||
608 | static int recover(struct mirror_set *ms, struct region *reg) | 608 | static int recover(struct mirror_set *ms, struct region *reg) |
diff --git a/drivers/md/kcopyd.c b/drivers/md/kcopyd.c index 72480a48d88b..73ab875fb158 100644 --- a/drivers/md/kcopyd.c +++ b/drivers/md/kcopyd.c | |||
@@ -314,7 +314,7 @@ static void complete_io(unsigned long error, void *context) | |||
314 | 314 | ||
315 | if (error) { | 315 | if (error) { |
316 | if (job->rw == WRITE) | 316 | if (job->rw == WRITE) |
317 | job->write_err &= error; | 317 | job->write_err |= error; |
318 | else | 318 | else |
319 | job->read_err = 1; | 319 | job->read_err = 1; |
320 | 320 | ||
@@ -460,7 +460,7 @@ static void segment_complete(int read_err, | |||
460 | job->read_err = 1; | 460 | job->read_err = 1; |
461 | 461 | ||
462 | if (write_err) | 462 | if (write_err) |
463 | job->write_err &= write_err; | 463 | job->write_err |= write_err; |
464 | 464 | ||
465 | /* | 465 | /* |
466 | * Only dispatch more work if there hasn't been an error. | 466 | * Only dispatch more work if there hasn't been an error. |