aboutsummaryrefslogtreecommitdiffstats
path: root/block
diff options
context:
space:
mode:
Diffstat (limited to 'block')
-rw-r--r--block/cfq-iosched.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c
index fce8a749f4be..3010e2ec20c2 100644
--- a/block/cfq-iosched.c
+++ b/block/cfq-iosched.c
@@ -173,7 +173,7 @@ struct cfq_data {
173 unsigned int cfq_slice[2]; 173 unsigned int cfq_slice[2];
174 unsigned int cfq_slice_async_rq; 174 unsigned int cfq_slice_async_rq;
175 unsigned int cfq_slice_idle; 175 unsigned int cfq_slice_idle;
176 unsigned int cfq_desktop; 176 unsigned int cfq_latency;
177 177
178 struct list_head cic_list; 178 struct list_head cic_list;
179 179
@@ -1341,7 +1341,7 @@ static int cfq_dispatch_requests(struct request_queue *q, int force)
1341 * We also ramp up the dispatch depth gradually for async IO, 1341 * We also ramp up the dispatch depth gradually for async IO,
1342 * based on the last sync IO we serviced 1342 * based on the last sync IO we serviced
1343 */ 1343 */
1344 if (!cfq_cfqq_sync(cfqq) && cfqd->cfq_desktop) { 1344 if (!cfq_cfqq_sync(cfqq) && cfqd->cfq_latency) {
1345 unsigned long last_sync = jiffies - cfqd->last_end_sync_rq; 1345 unsigned long last_sync = jiffies - cfqd->last_end_sync_rq;
1346 unsigned int depth; 1346 unsigned int depth;
1347 1347
@@ -1980,7 +1980,7 @@ cfq_update_idle_window(struct cfq_data *cfqd, struct cfq_queue *cfqq,
1980 enable_idle = old_idle = cfq_cfqq_idle_window(cfqq); 1980 enable_idle = old_idle = cfq_cfqq_idle_window(cfqq);
1981 1981
1982 if (!atomic_read(&cic->ioc->nr_tasks) || !cfqd->cfq_slice_idle || 1982 if (!atomic_read(&cic->ioc->nr_tasks) || !cfqd->cfq_slice_idle ||
1983 (!cfqd->cfq_desktop && cfqd->hw_tag && CIC_SEEKY(cic))) 1983 (!cfqd->cfq_latency && cfqd->hw_tag && CIC_SEEKY(cic)))
1984 enable_idle = 0; 1984 enable_idle = 0;
1985 else if (sample_valid(cic->ttime_samples)) { 1985 else if (sample_valid(cic->ttime_samples)) {
1986 if (cic->ttime_mean > cfqd->cfq_slice_idle) 1986 if (cic->ttime_mean > cfqd->cfq_slice_idle)
@@ -2511,7 +2511,7 @@ static void *cfq_init_queue(struct request_queue *q)
2511 cfqd->cfq_slice[1] = cfq_slice_sync; 2511 cfqd->cfq_slice[1] = cfq_slice_sync;
2512 cfqd->cfq_slice_async_rq = cfq_slice_async_rq; 2512 cfqd->cfq_slice_async_rq = cfq_slice_async_rq;
2513 cfqd->cfq_slice_idle = cfq_slice_idle; 2513 cfqd->cfq_slice_idle = cfq_slice_idle;
2514 cfqd->cfq_desktop = 1; 2514 cfqd->cfq_latency = 1;
2515 cfqd->hw_tag = 1; 2515 cfqd->hw_tag = 1;
2516 cfqd->last_end_sync_rq = jiffies; 2516 cfqd->last_end_sync_rq = jiffies;
2517 return cfqd; 2517 return cfqd;
@@ -2581,7 +2581,7 @@ SHOW_FUNCTION(cfq_slice_idle_show, cfqd->cfq_slice_idle, 1);
2581SHOW_FUNCTION(cfq_slice_sync_show, cfqd->cfq_slice[1], 1); 2581SHOW_FUNCTION(cfq_slice_sync_show, cfqd->cfq_slice[1], 1);
2582SHOW_FUNCTION(cfq_slice_async_show, cfqd->cfq_slice[0], 1); 2582SHOW_FUNCTION(cfq_slice_async_show, cfqd->cfq_slice[0], 1);
2583SHOW_FUNCTION(cfq_slice_async_rq_show, cfqd->cfq_slice_async_rq, 0); 2583SHOW_FUNCTION(cfq_slice_async_rq_show, cfqd->cfq_slice_async_rq, 0);
2584SHOW_FUNCTION(cfq_desktop_show, cfqd->cfq_desktop, 0); 2584SHOW_FUNCTION(cfq_low_latency_show, cfqd->cfq_latency, 0);
2585#undef SHOW_FUNCTION 2585#undef SHOW_FUNCTION
2586 2586
2587#define STORE_FUNCTION(__FUNC, __PTR, MIN, MAX, __CONV) \ 2587#define STORE_FUNCTION(__FUNC, __PTR, MIN, MAX, __CONV) \
@@ -2613,7 +2613,7 @@ STORE_FUNCTION(cfq_slice_sync_store, &cfqd->cfq_slice[1], 1, UINT_MAX, 1);
2613STORE_FUNCTION(cfq_slice_async_store, &cfqd->cfq_slice[0], 1, UINT_MAX, 1); 2613STORE_FUNCTION(cfq_slice_async_store, &cfqd->cfq_slice[0], 1, UINT_MAX, 1);
2614STORE_FUNCTION(cfq_slice_async_rq_store, &cfqd->cfq_slice_async_rq, 1, 2614STORE_FUNCTION(cfq_slice_async_rq_store, &cfqd->cfq_slice_async_rq, 1,
2615 UINT_MAX, 0); 2615 UINT_MAX, 0);
2616STORE_FUNCTION(cfq_desktop_store, &cfqd->cfq_desktop, 0, 1, 0); 2616STORE_FUNCTION(cfq_low_latency_store, &cfqd->cfq_latency, 0, 1, 0);
2617#undef STORE_FUNCTION 2617#undef STORE_FUNCTION
2618 2618
2619#define CFQ_ATTR(name) \ 2619#define CFQ_ATTR(name) \
@@ -2629,7 +2629,7 @@ static struct elv_fs_entry cfq_attrs[] = {
2629 CFQ_ATTR(slice_async), 2629 CFQ_ATTR(slice_async),
2630 CFQ_ATTR(slice_async_rq), 2630 CFQ_ATTR(slice_async_rq),
2631 CFQ_ATTR(slice_idle), 2631 CFQ_ATTR(slice_idle),
2632 CFQ_ATTR(desktop), 2632 CFQ_ATTR(low_latency),
2633 __ATTR_NULL 2633 __ATTR_NULL
2634}; 2634};
2635 2635