1 files changed, 5 insertions, 3 deletions

diff --git a/kernel/fork.c b/kernel/fork.c
index 443f5125f11e..f3fa18887cc9 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -873,6 +873,7 @@ static int copy_io(unsigned long clone_flags, struct task_struct *tsk)
 {
 #ifdef CONFIG_BLOCK
         struct io_context *ioc = current->io_context;
+        struct io_context *new_ioc;
 
         if (!ioc)
                 return 0;
@@ -884,11 +885,12 @@ static int copy_io(unsigned long clone_flags, struct task_struct *tsk)
                 if (unlikely(!tsk->io_context))
                         return -ENOMEM;
         } else if (ioprio_valid(ioc->ioprio)) {
-                tsk->io_context = alloc_io_context(GFP_KERNEL, -1);
-                if (unlikely(!tsk->io_context))
+                new_ioc = get_task_io_context(tsk, GFP_KERNEL, NUMA_NO_NODE);
+                if (unlikely(!new_ioc))
                         return -ENOMEM;
 
-                tsk->io_context->ioprio = ioc->ioprio;
+                new_ioc->ioprio = ioc->ioprio;
+                put_io_context(new_ioc, NULL);
         }
 #endif
         return 0;