diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-07 17:07:20 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-07 17:07:20 -0400 |
| commit | 48fe37cb53a40e13c2f9fc974f574e38d18be303 (patch) | |
| tree | 688851f7b8bb6ca87bb021a23213bbdb46cc9719 /drivers | |
| parent | e33b3e7567f8636c61e79ff1da5ff9a6cf6562c7 (diff) | |
| parent | 0341509fdfc9519f7de6aabc5dd23217cef72b73 (diff) | |
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
blk-cgroup: Fix an RCU warning in blkiocg_create()
blk-cgroup: Fix RCU correctness warning in cfq_init_queue()
drbd: don't expose failed local READ to upper layers
Diffstat (limited to 'drivers')
| -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 |