Re: [PATCH RESEND 4/5] block: Remove blk_mq_attempt_merge() function

2020-08-17 Thread Baolin Wang
On Mon, Aug 17, 2020 at 08:31:53AM +0200, Christoph Hellwig wrote: > On Mon, Aug 17, 2020 at 12:09:18PM +0800, Baolin Wang wrote: > > unsigned int nr_segs) > > { > > @@ -447,7 +425,16 @@ bool __blk_mq_sched_bio_merge(struct request_queue *q, > > struct bio *bio, > >

Re: [PATCH RESEND 4/5] block: Remove blk_mq_attempt_merge() function

2020-08-16 Thread Christoph Hellwig
On Mon, Aug 17, 2020 at 12:09:18PM +0800, Baolin Wang wrote: > unsigned int nr_segs) > { > @@ -447,7 +425,16 @@ bool __blk_mq_sched_bio_merge(struct request_queue *q, > struct bio *bio, > !list_empty_careful(&ctx->rq_lists[type])) { > /* default p

[PATCH RESEND 4/5] block: Remove blk_mq_attempt_merge() function

2020-08-16 Thread Baolin Wang
The small blk_mq_attempt_merge() function is only called by __blk_mq_sched_bio_merge(), just open code it. Signed-off-by: Baolin Wang --- block/blk-mq-sched.c | 33 ++--- 1 file changed, 10 insertions(+), 23 deletions(-) diff --git a/block/blk-mq-sched.c b/block/blk-