summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2021-11-26 12:58:14 +0100
committerJens Axboe <axboe@kernel.dk>2021-11-29 06:41:29 -0700
commit8ffc13680eac16a1eec86275b65fc6f0e27a30d8 (patch)
treedb16d6b30b907c381f0288e57016abbbfebdeb29
parenta0f14d8baaca3e2f3e57bdb062eb476175c90e83 (diff)
downloadlinux-8ffc13680eac16a1eec86275b65fc6f0e27a30d8.tar.bz2
block: use alloc_io_context in __copy_io
In __copy_io we know that the newly allocate task_struct does not have an I/O context yet and is not exiting. So just allocate the I/O context struct and install it directly. There is no need to lock the task either as it is just being created. Signed-off-by: Christoph Hellwig <hch@lst.de> Link: https://lore.kernel.org/r/20211126115817.2087431-12-hch@lst.de Signed-off-by: Jens Axboe <axboe@kernel.dk>
-rw-r--r--block/blk-ioc.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/block/blk-ioc.c b/block/blk-ioc.c
index b42fbb82d5c0..f06d1040442c 100644
--- a/block/blk-ioc.c
+++ b/block/blk-ioc.c
@@ -336,7 +336,6 @@ struct io_context *get_task_io_context(struct task_struct *task,
int __copy_io(unsigned long clone_flags, struct task_struct *tsk)
{
struct io_context *ioc = current->io_context;
- struct io_context *new_ioc;
/*
* Share io context with parent, if CLONE_IO is set
@@ -347,12 +346,10 @@ int __copy_io(unsigned long clone_flags, struct task_struct *tsk)
atomic_inc(&ioc->nr_tasks);
tsk->io_context = ioc;
} else if (ioprio_valid(ioc->ioprio)) {
- new_ioc = get_task_io_context(tsk, GFP_KERNEL, NUMA_NO_NODE);
- if (unlikely(!new_ioc))
+ tsk->io_context = alloc_io_context(GFP_KERNEL, NUMA_NO_NODE);
+ if (!tsk->io_context)
return -ENOMEM;
-
- new_ioc->ioprio = ioc->ioprio;
- put_io_context(new_ioc);
+ tsk->io_context->ioprio = ioc->ioprio;
}
return 0;