summaryrefslogtreecommitdiff
path: root/block
diff options
context:
space:
mode:
authorAlex Shi <alex.shi@linaro.org>2016-08-11 12:15:55 +0800
committerAlex Shi <alex.shi@linaro.org>2016-08-11 12:15:55 +0800
commite01035c1a71d7cceebc3df92f79577df7438523a (patch)
treef745442c513b343e0a5d8fc84c4c0eb6603ec7b2 /block
parentda9a92f0cde9ce34a930d7edcaef30429e41d14a (diff)
parent3d27bcb804a6889e8f16daf95751764907f1e100 (diff)
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
Diffstat (limited to 'block')
-rw-r--r--block/ioprio.c2
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;
}