Skip to content

L
linux-davinci
Commit 6a7cc883 authored by Jens Axboe's avatar Jens Axboe
Browse files
Options

Merge branch 'for-jens' of git://git.drbd.org/linux-2.6-drbd into for-linus

parents be1066bb 5c3c7e64
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
drivers/block/drbd/drbd_worker.c
View file @ 6a7cc883
...@@ -235,7 +235,7 @@ void drbd_endio_pri(struct bio *bio, int error) ...@@ -235,7 +235,7 @@ void drbd_endio_pri(struct bio *bio, int error)
if (unlikely(error)) { if (unlikely(error)) {
what = (bio_data_dir(bio) == WRITE) what = (bio_data_dir(bio) == WRITE)
? write_completed_with_error ? write_completed_with_error
: (bio_rw(bio) == READA) : (bio_rw(bio) == READ)
? read_completed_with_error ? read_completed_with_error
: read_ahead_completed_with_error; : read_ahead_completed_with_error;
} else } else
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment