git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
drivers
/
md
/
kcopyd.c
diff --git
a/drivers/md/kcopyd.c
b/drivers/md/kcopyd.c
index
72480a4
..
f1db6ef
100644
(file)
--- a/
drivers/md/kcopyd.c
+++ b/
drivers/md/kcopyd.c
@@
-12,7
+12,6
@@
#include <asm/atomic.h>
#include <linux/blkdev.h>
#include <asm/atomic.h>
#include <linux/blkdev.h>
-#include <linux/config.h>
#include <linux/fs.h>
#include <linux/init.h>
#include <linux/list.h>
#include <linux/fs.h>
#include <linux/init.h>
#include <linux/list.h>
@@
-314,7
+313,7
@@
static void complete_io(unsigned long error, void *context)
if (error) {
if (job->rw == WRITE)
if (error) {
if (job->rw == WRITE)
- job->write_err
&
= error;
+ job->write_err
|
= error;
else
job->read_err = 1;
else
job->read_err = 1;
@@
-460,7
+459,7
@@
static void segment_complete(int read_err,
job->read_err = 1;
if (write_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.
/*
* Only dispatch more work if there hasn't been an error.