git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' into for-2.6.35
[safe/jmp/linux-2.6]
/
drivers
/
block
/
drbd
/
drbd_worker.c
diff --git
a/drivers/block/drbd/drbd_worker.c
b/drivers/block/drbd/drbd_worker.c
index
15c9620
..
727ff63
100644
(file)
--- a/
drivers/block/drbd/drbd_worker.c
+++ b/
drivers/block/drbd/drbd_worker.c
@@
-240,7
+240,7
@@
void drbd_endio_pri(struct bio *bio, int error)
if (unlikely(error)) {
what = (bio_data_dir(bio) == WRITE)
? write_completed_with_error
- : (bio_rw(bio) == READ
A
)
+ : (bio_rw(bio) == READ)
? read_completed_with_error
: read_ahead_completed_with_error;
} else