diff options
| author | Jens Axboe <jens.axboe@oracle.com> | 2010-05-04 08:48:53 +0200 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2010-05-04 08:48:53 +0200 |
| commit | 6a7cc883d6ad95bb89282fc04e917c16d2b5584f (patch) | |
| tree | d22aadedb814584b7305586feefbcb35345372de /drivers/block | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 (diff) | |
| parent | drbd: don't expose failed local READ to upper layers (diff) | |
| download | linux-6a7cc883d6ad95bb89282fc04e917c16d2b5584f.tar.xz linux-6a7cc883d6ad95bb89282fc04e917c16d2b5584f.zip | |
Merge branch 'for-jens' of git://git.drbd.org/linux-2.6-drbd into for-linus
Diffstat (limited to 'drivers/block')
| -rw-r--r-- | drivers/block/drbd/drbd_worker.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/drbd/drbd_worker.c b/drivers/block/drbd/drbd_worker.c index 44bf6d11197e..d48a1dfd7b24 100644 --- a/drivers/block/drbd/drbd_worker.c +++ b/drivers/block/drbd/drbd_worker.c @@ -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 |