diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-08-30 10:51:05 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-08-30 10:51:05 +0800 |
| commit | 7b324954a4d9bbef9d6acd7c329f6e1289c1d7cb (patch) | |
| tree | d07bccdf7db563dce2159b2579cbdddf46a6a92b /block | |
| parent | 319076fb46276e430ca0a8c5ab18bf02fa5dca9c (diff) | |
| parent | 59e65b4bbfe7d0139ab1ab59cd27a5db95f5bb7b (diff) | |
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-rt
Conflicts:
drivers/gpu/drm/i915/i915_gem_shrinker.c
add cpu_chill in fs/dcache.c
select USERCOPY in SLAB init/Kconfig
remove VM_DEBUG in irq disable mm/memcontrol.c
Diffstat (limited to 'block')
| -rw-r--r-- | block/genhd.c | 1 | ||||
| -rw-r--r-- | block/ioprio.c | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/block/genhd.c b/block/genhd.c index e5cafa51567c..d2a1d43bf9fa 100644 --- a/block/genhd.c +++ b/block/genhd.c @@ -831,6 +831,7 @@ static void disk_seqf_stop(struct seq_file *seqf, void *v) if (iter) { class_dev_iter_exit(iter); kfree(iter); + seqf->private = NULL; } } diff --git a/block/ioprio.c b/block/ioprio.c index cc7800e9eb44..01b8116298a1 100644 --- a/block/ioprio.c +++ b/block/ioprio.c @@ -150,8 +150,10 @@ static int get_task_ioprio(struct task_struct *p) if (ret) goto out; ret = IOPRIO_PRIO_VALUE(IOPRIO_CLASS_NONE, IOPRIO_NORM); + task_lock(p); if (p->io_context) ret = p->io_context->ioprio; + task_unlock(p); out: return ret; } |