diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-07-15 10:26:04 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-07-15 10:26:04 +0200 |
| commit | 38452af2424dc99854c78523d74b260fa8a984f0 (patch) | |
| tree | 0dc49c27e1a58a0b35c23db05d85d2e8571ea471 /block/ioprio.c | |
| parent | dcb32d9913b7ed527b135a7e221f8d14b67bb952 (diff) | |
| parent | be8a18e2e98e04a5def5887d913b267865562448 (diff) | |
| download | linux-38452af2424dc99854c78523d74b260fa8a984f0.tar.bz2 | |
Merge branch 'x86/asm' into x86/mm, to resolve conflicts
Conflicts:
tools/testing/selftests/x86/Makefile
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'block/ioprio.c')
| -rw-r--r-- | block/ioprio.c | 2 |
1 files changed, 2 insertions, 0 deletions
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; } |