Re: [PATCH 2/4] blk-mq: merge mq and sq make_request instances

2017-03-20 Thread Bart Van Assche
On 03/20/2017 04:39 PM, Christoph Hellwig wrote: > @@ -1534,7 +1529,36 @@ static blk_qc_t blk_mq_make_request(struct > request_queue *q, struct bio *bio) > } > > plug = current->plug; > - if (((plug && !blk_queue_nomerges(q)) || is_sync)) { > + if (plug && q->nr_hw_queues ==

Re: [PATCH 2/4] blk-mq: merge mq and sq make_request instances

2017-03-13 Thread h...@lst.de
On Mon, Mar 13, 2017 at 09:01:08PM +, Bart Van Assche wrote: > > + /* > > +* @request_count may become stale because of schedule > > +* out, so check the list again. > > +*/ > > The above comment was relevant as long as there was a request_count

Re: [PATCH 2/4] blk-mq: merge mq and sq make_request instances

2017-03-13 Thread Bart Van Assche
On Mon, 2017-03-13 at 09:48 -0600, Christoph Hellwig wrote: > @@ -1534,7 +1529,36 @@ static blk_qc_t blk_mq_make_request(struct > request_queue *q, struct bio *bio) > } > > plug = current->plug; > - if (((plug && !blk_queue_nomerges(q)) || is_sync)) { > + if (plug &&