From eca5892a5d616d39185d652820931f21cab2f190 Mon Sep 17 00:00:00 2001 From: Christoph Hellwig Date: Fri, 26 Nov 2021 12:58:17 +0100 Subject: block: simplify ioc_lookup_icq Remove the ioc argument as it always points to current->io_context. Signed-off-by: Christoph Hellwig Link: https://lore.kernel.org/r/20211126115817.2087431-15-hch@lst.de Signed-off-by: Jens Axboe --- block/blk-ioc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'block/blk-ioc.c') diff --git a/block/blk-ioc.c b/block/blk-ioc.c index c56648f7cad4..536fb496ad76 100644 --- a/block/blk-ioc.c +++ b/block/blk-ioc.c @@ -353,14 +353,14 @@ int __copy_io(unsigned long clone_flags, struct task_struct *tsk) /** * ioc_lookup_icq - lookup io_cq from ioc - * @ioc: the associated io_context * @q: the associated request_queue * * Look up io_cq associated with @ioc - @q pair from @ioc. Must be called * with @q->queue_lock held. */ -struct io_cq *ioc_lookup_icq(struct io_context *ioc, struct request_queue *q) +struct io_cq *ioc_lookup_icq(struct request_queue *q) { + struct io_context *ioc = current->io_context; struct io_cq *icq; lockdep_assert_held(&q->queue_lock); @@ -430,7 +430,7 @@ static struct io_cq *ioc_create_icq(struct request_queue *q) et->ops.init_icq(icq); } else { kmem_cache_free(et->icq_cache, icq); - icq = ioc_lookup_icq(ioc, q); + icq = ioc_lookup_icq(q); if (!icq) printk(KERN_ERR "cfq: icq link failed!\n"); } @@ -454,7 +454,7 @@ struct io_cq *ioc_find_get_icq(struct request_queue *q) get_io_context(ioc); spin_lock_irq(&q->queue_lock); - icq = ioc_lookup_icq(ioc, q); + icq = ioc_lookup_icq(q); spin_unlock_irq(&q->queue_lock); } -- cgit v1.2.3