summaryrefslogtreecommitdiffstats
path: root/block
diff options
context:
space:
mode:
Diffstat (limited to 'block')
-rw-r--r--block/as-iosched.c6
-rw-r--r--block/cfq-iosched.c6
2 files changed, 12 insertions, 0 deletions
diff --git a/block/as-iosched.c b/block/as-iosched.c
index 80af925..4c6fafb 100644
--- a/block/as-iosched.c
+++ b/block/as-iosched.c
@@ -745,6 +745,12 @@ static int as_can_break_anticipation(struct as_data *ad, struct request *rq)
*/
static int as_can_anticipate(struct as_data *ad, struct request *rq)
{
+ /*
+ * SSD device without seek penalty, disable idling
+ */
+ if (blk_queue_nonrot(ad->q))
+ return 0;
+
if (!ad->io_context)
/*
* Last request submitted was a write
diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c
index 494b6fd..03a5953b 100644
--- a/block/cfq-iosched.c
+++ b/block/cfq-iosched.c
@@ -878,6 +878,12 @@ static void cfq_arm_slice_timer(struct cfq_data *cfqd)
struct cfq_io_context *cic;
unsigned long sl;
+ /*
+ * SSD device without seek penalty, disable idling
+ */
+ if (blk_queue_nonrot(cfqd->queue))
+ return;
+
WARN_ON(!RB_EMPTY_ROOT(&cfqq->sort_list));
WARN_ON(cfq_cfqq_slice_new(cfqq));
OpenPOWER on IntegriCloud