Merge branch 'for-jens' of git://git.drbd.org/linux-2.6-drbd into for-linus
This commit is contained in:
commit
6a7cc883d6
|
@ -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
|
||||||
|
|
Loading…
Reference in New Issue