mirror of
https://github.com/tbsdtv/linux_media.git
synced 2025-07-23 20:51:03 +02:00
block: remove the gfp_mask argument to bounce_clone_bio
The only caller always passes GFP_NOIO. Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
committed by
Jens Axboe
parent
b90994c6ab
commit
ebfe4183c7
@@ -214,7 +214,7 @@ static void bounce_end_io_read_isa(struct bio *bio)
|
|||||||
__bounce_end_io_read(bio, &isa_page_pool);
|
__bounce_end_io_read(bio, &isa_page_pool);
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct bio *bounce_clone_bio(struct bio *bio_src, gfp_t gfp_mask)
|
static struct bio *bounce_clone_bio(struct bio *bio_src)
|
||||||
{
|
{
|
||||||
struct bvec_iter iter;
|
struct bvec_iter iter;
|
||||||
struct bio_vec bv;
|
struct bio_vec bv;
|
||||||
@@ -242,9 +242,9 @@ static struct bio *bounce_clone_bio(struct bio *bio_src, gfp_t gfp_mask)
|
|||||||
* __bio_clone_fast() anyways.
|
* __bio_clone_fast() anyways.
|
||||||
*/
|
*/
|
||||||
if (bio_is_passthrough(bio_src))
|
if (bio_is_passthrough(bio_src))
|
||||||
bio = bio_kmalloc(gfp_mask, bio_segments(bio_src));
|
bio = bio_kmalloc(GFP_NOIO, bio_segments(bio_src));
|
||||||
else
|
else
|
||||||
bio = bio_alloc_bioset(gfp_mask, bio_segments(bio_src),
|
bio = bio_alloc_bioset(GFP_NOIO, bio_segments(bio_src),
|
||||||
&bounce_bio_set);
|
&bounce_bio_set);
|
||||||
if (!bio)
|
if (!bio)
|
||||||
return NULL;
|
return NULL;
|
||||||
@@ -271,11 +271,11 @@ static struct bio *bounce_clone_bio(struct bio *bio_src, gfp_t gfp_mask)
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (bio_crypt_clone(bio, bio_src, gfp_mask) < 0)
|
if (bio_crypt_clone(bio, bio_src, GFP_NOIO) < 0)
|
||||||
goto err_put;
|
goto err_put;
|
||||||
|
|
||||||
if (bio_integrity(bio_src) &&
|
if (bio_integrity(bio_src) &&
|
||||||
bio_integrity_clone(bio, bio_src, gfp_mask) < 0)
|
bio_integrity_clone(bio, bio_src, GFP_NOIO) < 0)
|
||||||
goto err_put;
|
goto err_put;
|
||||||
|
|
||||||
bio_clone_blkg_association(bio, bio_src);
|
bio_clone_blkg_association(bio, bio_src);
|
||||||
@@ -315,7 +315,7 @@ static void __blk_queue_bounce(struct request_queue *q, struct bio **bio_orig,
|
|||||||
submit_bio_noacct(*bio_orig);
|
submit_bio_noacct(*bio_orig);
|
||||||
*bio_orig = bio;
|
*bio_orig = bio;
|
||||||
}
|
}
|
||||||
bio = bounce_clone_bio(*bio_orig, GFP_NOIO);
|
bio = bounce_clone_bio(*bio_orig);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Bvec table can't be updated by bio_for_each_segment_all(),
|
* Bvec table can't be updated by bio_for_each_segment_all(),
|
||||||
|
Reference in New Issue
Block a user