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 /fs/exofs | |
| parent | c8158819d506a8aedeca53c52dfb709a0aabe011 (diff) | |
| parent | 29ed7813ce5c4661261aeebddb1b8660e0860223 (diff) | |
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 'fs/exofs')
| -rw-r--r-- | fs/exofs/ore.c | 2 | ||||
| -rw-r--r-- | fs/exofs/ore_raid.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/fs/exofs/ore.c b/fs/exofs/ore.c index f936cb50dc0d..b74422888604 100644 --- a/fs/exofs/ore.c +++ b/fs/exofs/ore.c @@ -401,7 +401,7 @@ static void _clear_bio(struct bio *bio) struct bio_vec *bv; unsigned i; - __bio_for_each_segment(bv, bio, i, 0) { + bio_for_each_segment_all(bv, bio, i) { unsigned this_count = bv->bv_len; if (likely(PAGE_SIZE == this_count)) diff --git a/fs/exofs/ore_raid.c b/fs/exofs/ore_raid.c index b963f38ac298..7682b970d0f1 100644 --- a/fs/exofs/ore_raid.c +++ b/fs/exofs/ore_raid.c @@ -432,7 +432,7 @@ static void _mark_read4write_pages_uptodate(struct ore_io_state *ios, int ret) if (!bio) continue; - __bio_for_each_segment(bv, bio, i, 0) { + bio_for_each_segment_all(bv, bio, i) { struct page *page = bv->bv_page; SetPageUptodate(page); |