aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJens Axboe <jens.axboe@oracle.com>2010-05-04 08:48:53 +0200
committerJens Axboe <jens.axboe@oracle.com>2010-05-04 08:48:53 +0200
commit6a7cc883d6ad95bb89282fc04e917c16d2b5584f (patch)
treed22aadedb814584b7305586feefbcb35345372de
parentbe1066bbcd443a65df312fdecea7e4959adedb45 (diff)
parent5c3c7e64bbcb60db39d0d55c8fab39ef41d41c30 (diff)
downloadmrst-s0i3-test-6a7cc883d6ad95bb89282fc04e917c16d2b5584f.tar.gz
mrst-s0i3-test-6a7cc883d6ad95bb89282fc04e917c16d2b5584f.tar.xz
mrst-s0i3-test-6a7cc883d6ad95bb89282fc04e917c16d2b5584f.zip
Merge branch 'for-jens' of git://git.drbd.org/linux-2.6-drbd into for-linus
-rw-r--r--drivers/block/drbd/drbd_worker.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/drbd/drbd_worker.c b/drivers/block/drbd/drbd_worker.c
index 44bf6d11197..d48a1dfd7b2 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