1 files changed, 20 insertions, 10 deletions

diff --git a/fs/ioprio.c b/fs/ioprio.c
index e4e01bc7f338..c4a1c3c65aac 100644
--- a/fs/ioprio.c
+++ b/fs/ioprio.c
@@ -41,18 +41,28 @@ static int set_task_ioprio(struct task_struct *task, int ioprio)
                 return err;
 
         task_lock(task);
+        do {
+                ioc = task->io_context;
+                /* see wmb() in current_io_context() */
+                smp_read_barrier_depends();
+                if (ioc)
+                        break;
 
-        task->ioprio = ioprio;
-
-        ioc = task->io_context;
-        /* see wmb() in current_io_context() */
-        smp_read_barrier_depends();
+                ioc = alloc_io_context(GFP_ATOMIC, -1);
+                if (!ioc) {
+                        err = -ENOMEM;
+                        break;
+                }
+                task->io_context = ioc;
+        } while (1);
 
-        if (ioc)
+        if (!err) {
+                ioc->ioprio = ioprio;
                 ioc->ioprio_changed = 1;
+        }
 
         task_unlock(task);
-        return 0;
+        return err;
 }
 
 asmlinkage long sys_ioprio_set(int which, int who, int ioprio)
@@ -75,8 +85,6 @@ asmlinkage long sys_ioprio_set(int which, int who, int ioprio)
 
                         break;
                 case IOPRIO_CLASS_IDLE:
-                        if (!capable(CAP_SYS_ADMIN))
-                                return -EPERM;
                         break;
                 case IOPRIO_CLASS_NONE:
                         if (data)
@@ -148,7 +156,9 @@ static int get_task_ioprio(struct task_struct *p)
         ret = security_task_getioprio(p);
         if (ret)
                 goto out;
-        ret = p->ioprio;
+        ret = IOPRIO_PRIO_VALUE(IOPRIO_CLASS_NONE, IOPRIO_NORM);
+        if (p->io_context)
+                ret = p->io_context->ioprio;
 out:
         return ret;
 }