diff options
Diffstat (limited to 'block')
| -rw-r--r-- | block/blktrace.c | 2 | ||||
| -rw-r--r-- | block/ll_rw_blk.c | 9 |
2 files changed, 1 insertions, 10 deletions
diff --git a/block/blktrace.c b/block/blktrace.c index 775471ef84a5..d00ac3993c18 100644 --- a/block/blktrace.c +++ b/block/blktrace.c @@ -550,7 +550,7 @@ static void blk_trace_set_ht_offsets(void) for_each_online_cpu(cpu) { unsigned long long *cpu_off, *sibling_off; - for_each_cpu_mask(i, cpu_sibling_map[cpu]) { + for_each_cpu_mask(i, per_cpu(cpu_sibling_map, cpu)) { if (i == cpu) continue; diff --git a/block/ll_rw_blk.c b/block/ll_rw_blk.c index 527bd8d4db50..9eabac95fbe0 100644 --- a/block/ll_rw_blk.c +++ b/block/ll_rw_blk.c @@ -4042,7 +4042,6 @@ queue_max_sectors_store(struct request_queue *q, const char *page, size_t count) max_hw_sectors_kb = q->max_hw_sectors >> 1, page_kb = 1 << (PAGE_CACHE_SHIFT - 10); ssize_t ret = queue_var_store(&max_sectors_kb, page, count); - int ra_kb; if (max_sectors_kb > max_hw_sectors_kb || max_sectors_kb < page_kb) return -EINVAL; @@ -4051,14 +4050,6 @@ queue_max_sectors_store(struct request_queue *q, const char *page, size_t count) * values synchronously: */ spin_lock_irq(q->queue_lock); - /* - * Trim readahead window as well, if necessary: - */ - ra_kb = q->backing_dev_info.ra_pages << (PAGE_CACHE_SHIFT - 10); - if (ra_kb > max_sectors_kb) - q->backing_dev_info.ra_pages = - max_sectors_kb >> (PAGE_CACHE_SHIFT - 10); - q->max_sectors = max_sectors_kb << 1; spin_unlock_irq(q->queue_lock); |