diff options
| author | Jens Axboe <jens.axboe@oracle.com> | 2010-05-04 02:48:53 -0400 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2010-05-04 02:48:53 -0400 |
| commit | 6a7cc883d6ad95bb89282fc04e917c16d2b5584f (patch) | |
| tree | d22aadedb814584b7305586feefbcb35345372de /drivers/block | |
| parent | be1066bbcd443a65df312fdecea7e4959adedb45 (diff) | |
| parent | 5c3c7e64bbcb60db39d0d55c8fab39ef41d41c30 (diff) | |
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) | |||
| 235 | if (unlikely(error)) { | 235 | if (unlikely(error)) { |
| 236 | what = (bio_data_dir(bio) == WRITE) | 236 | what = (bio_data_dir(bio) == WRITE) |
| 237 | ? write_completed_with_error | 237 | ? write_completed_with_error |
| 238 | : (bio_rw(bio) == READA) | 238 | : (bio_rw(bio) == READ) |
| 239 | ? read_completed_with_error | 239 | ? read_completed_with_error |
| 240 | : read_ahead_completed_with_error; | 240 | : read_ahead_completed_with_error; |
| 241 | } else | 241 | } else |