block: fix plug list flushing for nomerge queues
authorJeff Moyer <jmoyer@redhat.com>
Tue, 20 Oct 2015 15:13:51 +0000 (23:13 +0800)
committerJens Axboe <axboe@fb.com>
Wed, 21 Oct 2015 21:00:48 +0000 (15:00 -0600)
commit0809e3ac62319dc7534b64f95ac37e230d740e8a
tree70814dd32f930745834e4186445acf8dcbd1e3c1
parent3380f4589f6d9725e275525fd0580c8ee2b5cbbc
block: fix plug list flushing for nomerge queues

Request queues with merging disabled will not flush the plug list after
BLK_MAX_REQUEST_COUNT requests have been queued, since the code relies
on blk_attempt_plug_merge to compute the request_count.  Fix this by
computing the number of queued requests even for nomerge queues.

Signed-off-by: Jeff Moyer <jmoyer@redhat.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
block/blk-core.c
block/blk-mq.c
block/blk.h