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

This commit is contained in:
Jens Axboe 2010-05-04 08:48:53 +02:00
commit 6a7cc883d6

View file

@ -235,7 +235,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) == READA)
: (bio_rw(bio) == READ)
? read_completed_with_error
: read_ahead_completed_with_error;
} else