Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
Revert "block: improve queue_should_plug() by looking at IO depths"
+3
-12
+2
-9
block/blk-core.c
+2
-9
block/blk-core.c
···
1147
1147
*/
1148
1148
static inline bool queue_should_plug(struct request_queue *q)
1149
1149
{
1150
-
return !(blk_queue_nonrot(q) && blk_queue_queuing(q));
1150
+
return !(blk_queue_nonrot(q) && blk_queue_tagged(q));
1151
1151
}
1152
1152
1153
1153
static int __make_request(struct request_queue *q, struct bio *bio)
···
1859
1859
* and to it is freed is accounted as io that is in progress at
1860
1860
* the driver side.
1861
1861
*/
1862
-
if (blk_account_rq(rq)) {
1862
+
if (blk_account_rq(rq))
1863
1863
q->in_flight[rq_is_sync(rq)]++;
1864
-
/*
1865
-
* Mark this device as supporting hardware queuing, if
1866
-
* we have more IOs in flight than 4.
1867
-
*/
1868
-
if (!blk_queue_queuing(q) && queue_in_flight(q) > 4)
1869
-
set_bit(QUEUE_FLAG_CQ, &q->queue_flags);
1870
-
}
1871
1864
}
1872
1865
1873
1866
/**
+1
-3
include/linux/blkdev.h
+1
-3
include/linux/blkdev.h
···
461
461
#define QUEUE_FLAG_NONROT 14 /* non-rotational device (SSD) */
462
462
#define QUEUE_FLAG_VIRT QUEUE_FLAG_NONROT /* paravirt device */
463
463
#define QUEUE_FLAG_IO_STAT 15 /* do IO stats */
464
-
#define QUEUE_FLAG_CQ 16 /* hardware does queuing */
465
-
#define QUEUE_FLAG_DISCARD 17 /* supports DISCARD */
464
+
#define QUEUE_FLAG_DISCARD 16 /* supports DISCARD */
466
465
467
466
#define QUEUE_FLAG_DEFAULT ((1 << QUEUE_FLAG_IO_STAT) | \
468
467
(1 << QUEUE_FLAG_CLUSTER) | \
···
585
586
586
587
#define blk_queue_plugged(q) test_bit(QUEUE_FLAG_PLUGGED, &(q)->queue_flags)
587
588
#define blk_queue_tagged(q) test_bit(QUEUE_FLAG_QUEUED, &(q)->queue_flags)
588
-
#define blk_queue_queuing(q) test_bit(QUEUE_FLAG_CQ, &(q)->queue_flags)
589
589
#define blk_queue_stopped(q) test_bit(QUEUE_FLAG_STOPPED, &(q)->queue_flags)
590
590
#define blk_queue_nomerges(q) test_bit(QUEUE_FLAG_NOMERGES, &(q)->queue_flags)
591
591
#define blk_queue_nonrot(q) test_bit(QUEUE_FLAG_NONROT, &(q)->queue_flags)