diff options
| author | Jens Axboe <axboe@kernel.dk> | 2013-05-01 09:23:05 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2013-05-01 09:23:05 +0200 |
| commit | f50efd2fdbd9b35b11f5778ed85beb764184bda9 (patch) | |
| tree | ed92b40995d60136fb387d210886e4aae2c37231 /drivers/md/bcache/request.c | |
| parent | 0821e904057505c7e25d72e1a282105d023b26c9 (diff) | |
| parent | ee66850642efda91d04179cae2414310675a1f73 (diff) | |
Merge branch 'bcache-for-upstream' of http://evilpiepirate.org/git/linux-bcache into for-3.10/drivers
Kent writes:
Hey Jens, this is everything I've got ready for 3.10 - there's _still_
one more bug I'm trying to track down.
Andrew - I've got patches that rip out the pkey() and pbtree() macros,
but they're somewhat tied up with some other nontrivial refactorings so
I think I'm going to wait a bit on those.
Diffstat (limited to 'drivers/md/bcache/request.c')
| -rw-r--r-- | drivers/md/bcache/request.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/md/bcache/request.c b/drivers/md/bcache/request.c index 83731dc36f34..e5ff12e52d5b 100644 --- a/drivers/md/bcache/request.c +++ b/drivers/md/bcache/request.c @@ -1220,7 +1220,7 @@ static void cached_dev_make_request(struct request_queue *q, struct bio *bio) part_stat_unlock(); bio->bi_bdev = dc->bdev; - bio->bi_sector += BDEV_DATA_START; + bio->bi_sector += dc->sb.data_offset; if (cached_dev_get(dc)) { s = search_alloc(bio, d); |