Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 69d60eb9 authored by Vivek Goyal's avatar Vivek Goyal Committed by Jens Axboe
Browse files

blk-throttle: Use blk_plug in throttle dispatch 



Use plug in throttle dispatch also as we are dispatching a bunch of
bios in throttle context and some of them might merge.

Signed-off-by: default avatarVivek Goyal <vgoyal@redhat.com>
Signed-off-by: default avatarJens Axboe <jaxboe@fusionio.com>
parent 721a9602

block/blk-throttle.c

+3 −0
Original line number Diff line number Diff line
@@ -770,6 +770,7 @@ static int throtl_dispatch(struct request_queue *q) 
	unsigned int nr_disp = 0;

	struct bio_list bio_list_on_stack;

	struct bio *bio;

	struct blk_plug plug;



	spin_lock_irq(q->queue_lock);
@@ -798,8 +799,10 @@ static int throtl_dispatch(struct request_queue *q) 
	 * immediate dispatch

	 */

	if (nr_disp) {

		blk_start_plug(&plug);

		while((bio = bio_list_pop(&bio_list_on_stack)))

			generic_make_request(bio);

		blk_finish_plug(&plug);

	}

	return nr_disp;

}