Skip to contentSkip to conversation

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

PATCH In review Tejun Heo 2 participants 2 messages Aug 19, 2010 – Aug 20, 2010

Subsystems (2)
Block layer libata
lore
Share & tools
lore

Tejun Heo

author
#0 lore raw

PATCH 1/1 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 Tejun Heo <[email protected]>
Cc Christoph Hellwig <[email protected]>

---
David, can I route this patch through block tree with other barrier changes?

Thanks.

 drivers/ide/ide-io.c   |   13 -------------
 include/linux/blkdev.h |    1 -
 2 files changed, 14 deletions(-)
drivers/ide/ide-io.c +0 -13
Index: block/drivers/ide/ide-io.c
===================================================================
@@ -441,19 +441,6 @@ void do_ide_request(struct request_queue
 	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
Index: block/include/linux/blkdev.h
===================================================================
@@ -520,7 +520,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)
Acked-by on v1 1/1
#1 lore raw

From: Tejun Heo <[email protected]>
Date: Thu, 19 Aug 2010 15:35:37 +0200

Quoted 5 lines

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.

Quoted 7 lines

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

Signed-off-by Tejun Heo <[email protected]>
Cc Christoph Hellwig <[email protected]>

---
David, can I route this patch through block tree with other barrier changes?

Sure:

Acked-by David S. Miller <[email protected]>