Commit 0da2f509 authored by Tejun Heo's avatar Tejun Heo Committed by Jens Axboe
Browse files

ide: remove unnecessary blk_queue_flushing() test in do_ide_request() 



Unplugging from a request function doesn't really help much (it's
already in the request_fn) and soon block layer will be updated to mix
barrier sequence with other commands, so there's no need to treat
queue flushing any differently.

ide was the only user of blk_queue_flushing().  Remove it.

Signed-off-by: default avatarTejun Heo <tj@kernel.org>
Cc: Christoph Hellwig <hch@lst.de>
Acked-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarJens Axboe <jaxboe@fusionio.com>
parent 76be97c1

drivers/ide/ide-io.c

+0 −13
Original line number Diff line number Diff line
@@ -441,19 +441,6 @@ void do_ide_request(struct request_queue *q) 
	struct request	*rq = NULL;

	ide_startstop_t	startstop;



	/*

	 * drive is doing pre-flush, ordered write, post-flush sequence. even

	 * though that is 3 requests, it must be seen as a single transaction.

	 * we must not preempt this drive until that is complete

	 */

	if (blk_queue_flushing(q))

		/*

		 * small race where queue could get replugged during

		 * the 3-request flush cycle, just yank the plug since

		 * we want it to finish asap

		 */

		blk_remove_plug(q);



	spin_unlock_irq(q->queue_lock);



	/* HLD do_request() callback might sleep, make sure it's okay */

include/linux/blkdev.h

+0 −1
Original line number Diff line number Diff line
@@ -521,7 +521,6 @@ enum { 
#define blk_queue_nonrot(q)	test_bit(QUEUE_FLAG_NONROT, &(q)->queue_flags)

#define blk_queue_io_stat(q)	test_bit(QUEUE_FLAG_IO_STAT, &(q)->queue_flags)

#define blk_queue_add_random(q)	test_bit(QUEUE_FLAG_ADD_RANDOM, &(q)->queue_flags)

#define blk_queue_flushing(q)	((q)->ordseq)

#define blk_queue_stackable(q)	\

	test_bit(QUEUE_FLAG_STACKABLE, &(q)->queue_flags)

#define blk_queue_discard(q)	test_bit(QUEUE_FLAG_DISCARD, &(q)->queue_flags)

CRA Git | Maintained and supported by SUSTech CRA and CCSE