diff options
| author | Baolin Wang <baolin.wang@linux.alibaba.com> | 2020-08-28 04:52:55 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2020-09-02 00:49:26 +0200 |
| commit | bdc6a287bc98e8f32bf52c9cb2d1bdf75975f5a0 (patch) | |
| tree | a21f895d98e33b5dd5b09af3d81973b86105dc3c /block/kyber-iosched.c | |
| parent | block: Move bio merge related functions into blk-merge.c (diff) | |
| download | linux-bdc6a287bc98e8f32bf52c9cb2d1bdf75975f5a0.tar.xz linux-bdc6a287bc98e8f32bf52c9cb2d1bdf75975f5a0.zip | |
block: Move blk_mq_bio_list_merge() into blk-merge.c
Move the blk_mq_bio_list_merge() into blk-merge.c and
rename it as a generic name.
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Baolin Wang <baolin.wang@linux.alibaba.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block/kyber-iosched.c')
| -rw-r--r-- | block/kyber-iosched.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/block/kyber-iosched.c b/block/kyber-iosched.c index a38c5ab103d1..6d4ba0e9688e 100644 --- a/block/kyber-iosched.c +++ b/block/kyber-iosched.c @@ -573,7 +573,7 @@ static bool kyber_bio_merge(struct blk_mq_hw_ctx *hctx, struct bio *bio, bool merged; spin_lock(&kcq->lock); - merged = blk_mq_bio_list_merge(hctx->queue, rq_list, bio, nr_segs); + merged = blk_bio_list_merge(hctx->queue, rq_list, bio, nr_segs); spin_unlock(&kcq->lock); return merged; |