diff options
author | Alex Shi <alex.shi@linaro.org> | 2015-03-13 09:15:58 +0800 |
---|---|---|
committer | Alex Shi <alex.shi@linaro.org> | 2015-03-13 15:21:35 +0800 |
commit | 438628396ca8a44f6b710a73612939bc54633d7c (patch) | |
tree | bf318740f48ff4699cd0154e900507597dae835e /block | |
parent | 5afe132e300375c685e60d80d6e5e6a822d216d6 (diff) | |
parent | 0d590a1ecd1ad44b2dae2bcdc5a6cb24a7080489 (diff) |
Merge branch 'linux-linaro-lsk-v3.14' into linux-linaro-lsk-v3.14-android
Remove cpuinfo_arm64/cpuinfo_store_cpu() that comes from commit
42b34c73ae40(used for stable kernel only), since we have
newer commit 5aa9ef6f286.
Conflicts:
arch/arm64/include/asm/cputype.h
arch/arm64/kernel/setup.c
Diffstat (limited to 'block')
-rw-r--r-- | block/blk-throttle.c | 3 | ||||
-rw-r--r-- | block/cfq-iosched.c | 16 |
2 files changed, 16 insertions, 3 deletions
diff --git a/block/blk-throttle.c b/block/blk-throttle.c index 1474c3ab7e72..15998784c00e 100644 --- a/block/blk-throttle.c +++ b/block/blk-throttle.c @@ -1292,6 +1292,9 @@ static u64 tg_prfill_cpu_rwstat(struct seq_file *sf, struct blkg_rwstat rwstat = { }, tmp; int i, cpu; + if (tg->stats_cpu == NULL) + return 0; + for_each_possible_cpu(cpu) { struct tg_stats_cpu *sc = per_cpu_ptr(tg->stats_cpu, cpu); diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c index 91c25f261c91..d9bba9915420 100644 --- a/block/cfq-iosched.c +++ b/block/cfq-iosched.c @@ -3585,6 +3585,11 @@ retry: blkcg = bio_blkcg(bio); cfqg = cfq_lookup_create_cfqg(cfqd, blkcg); + if (!cfqg) { + cfqq = &cfqd->oom_cfqq; + goto out; + } + cfqq = cic_to_cfqq(cic, is_sync); /* @@ -3621,7 +3626,7 @@ retry: } else cfqq = &cfqd->oom_cfqq; } - +out: if (new_cfqq) kmem_cache_free(cfq_pool, new_cfqq); @@ -3651,12 +3656,17 @@ static struct cfq_queue * cfq_get_queue(struct cfq_data *cfqd, bool is_sync, struct cfq_io_cq *cic, struct bio *bio, gfp_t gfp_mask) { - const int ioprio_class = IOPRIO_PRIO_CLASS(cic->ioprio); - const int ioprio = IOPRIO_PRIO_DATA(cic->ioprio); + int ioprio_class = IOPRIO_PRIO_CLASS(cic->ioprio); + int ioprio = IOPRIO_PRIO_DATA(cic->ioprio); struct cfq_queue **async_cfqq = NULL; struct cfq_queue *cfqq = NULL; if (!is_sync) { + if (!ioprio_valid(cic->ioprio)) { + struct task_struct *tsk = current; + ioprio = task_nice_ioprio(tsk); + ioprio_class = task_nice_ioclass(tsk); + } async_cfqq = cfq_async_queue_prio(cfqd, ioprio_class, ioprio); cfqq = *async_cfqq; } |