diff options
author | Jens Axboe <axboe@kernel.dk> | 2013-03-24 21:38:59 -0600 |
---|---|---|
committer | Jens Axboe <axboe@kernel.dk> | 2013-03-24 21:38:59 -0600 |
commit | 705cd0ea1cde2ce9225f1485c5a32c5841cacc5f (patch) | |
tree | 72bc2c5eded0e04fc5e70ca2bd6df93a2e264112 /drivers/block/rbd.c | |
parent | c8158819d506a8aedeca53c52dfb709a0aabe011 (diff) | |
parent | 29ed7813ce5c4661261aeebddb1b8660e0860223 (diff) | |
download | linux-3.10-705cd0ea1cde2ce9225f1485c5a32c5841cacc5f.tar.gz linux-3.10-705cd0ea1cde2ce9225f1485c5a32c5841cacc5f.tar.bz2 linux-3.10-705cd0ea1cde2ce9225f1485c5a32c5841cacc5f.zip |
Merge branch 'for-jens' of http://evilpiepirate.org/git/linux-bcache into for-3.10/core
This contains Kents prep work for the immutable bio_vecs.
Diffstat (limited to 'drivers/block/rbd.c')
-rw-r--r-- | drivers/block/rbd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index 6c81a4c040b..11e179826b6 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -952,7 +952,7 @@ static struct bio *bio_clone_range(struct bio *bio_src, /* Find first affected segment... */ resid = offset; - __bio_for_each_segment(bv, bio_src, idx, 0) { + bio_for_each_segment(bv, bio_src, idx) { if (resid < bv->bv_len) break; resid -= bv->bv_len; |