Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 25d8be77 authored by Ming Lei's avatar Ming Lei Committed by Jens Axboe
Browse files

block: move bio_alloc_pages() to bcache 



bcache is the only user of bio_alloc_pages(), so move this function into
bcache, and avoid it being misused in the future.

Also rename it to bch_bio_allo_pages() since it is bcache only.

Signed-off-by: default avatarMing Lei <ming.lei@redhat.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent c2421edf

block/bio.c

+0 −28
Original line number Diff line number Diff line
@@ -968,34 +968,6 @@ void bio_advance(struct bio *bio, unsigned bytes) 
}

EXPORT_SYMBOL(bio_advance);



/**

 * bio_alloc_pages - allocates a single page for each bvec in a bio

 * @bio: bio to allocate pages for

 * @gfp_mask: flags for allocation

 *

 * Allocates pages up to @bio->bi_vcnt.

 *

 * Returns 0 on success, -ENOMEM on failure. On failure, any allocated pages are

 * freed.

 */

int bio_alloc_pages(struct bio *bio, gfp_t gfp_mask)

{

	int i;

	struct bio_vec *bv;



	bio_for_each_segment_all(bv, bio, i) {

		bv->bv_page = alloc_page(gfp_mask);

		if (!bv->bv_page) {

			while (--bv >= bio->bi_io_vec)

				__free_page(bv->bv_page);

			return -ENOMEM;

		}

	}



	return 0;

}

EXPORT_SYMBOL(bio_alloc_pages);



/**

 * bio_copy_data - copy contents of data buffers from one chain of bios to

 * another

drivers/md/bcache/btree.c

+1 −1
Original line number Diff line number Diff line
@@ -419,7 +419,7 @@ static void do_btree_node_write(struct btree *b) 
	SET_PTR_OFFSET(&k.key, 0, PTR_OFFSET(&k.key, 0) +

		       bset_sector_offset(&b->keys, i));



	if (!bio_alloc_pages(b->bio, __GFP_NOWARN|GFP_NOWAIT)) {

	if (!bch_bio_alloc_pages(b->bio, __GFP_NOWARN|GFP_NOWAIT)) {

		int j;

		struct bio_vec *bv;

		void *base = (void *) ((unsigned long) i & ~(PAGE_SIZE - 1));

drivers/md/bcache/debug.c

+1 −1
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ void bch_data_verify(struct cached_dev *dc, struct bio *bio) 
		return;

	check->bi_opf = REQ_OP_READ;



	if (bio_alloc_pages(check, GFP_NOIO))

	if (bch_bio_alloc_pages(check, GFP_NOIO))

		goto out_put;



	submit_bio_wait(check);

drivers/md/bcache/movinggc.c

+1 −1
Original line number Diff line number Diff line
@@ -162,7 +162,7 @@ static void read_moving(struct cache_set *c) 
		bio_set_op_attrs(bio, REQ_OP_READ, 0);

		bio->bi_end_io	= read_moving_endio;



		if (bio_alloc_pages(bio, GFP_KERNEL))

		if (bch_bio_alloc_pages(bio, GFP_KERNEL))

			goto err;



		trace_bcache_gc_copy(&w->key);

drivers/md/bcache/request.c

+1 −1
Original line number Diff line number Diff line
@@ -841,7 +841,7 @@ static int cached_dev_cache_miss(struct btree *b, struct search *s, 
	cache_bio->bi_private	= &s->cl;



	bch_bio_map(cache_bio, NULL);

	if (bio_alloc_pages(cache_bio, __GFP_NOWARN|GFP_NOIO))

	if (bch_bio_alloc_pages(cache_bio, __GFP_NOWARN|GFP_NOIO))

		goto out_put;



	if (reada)