block: simplify ioc_lookup_icq

Remove the ioc argument as it always points to current->io_context.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20211126115817.2087431-15-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c
index 8295b0f..0c612a9 100644 (file)
--- a/block/bfq-iosched.c
+++ b/block/bfq-iosched.c
@@ -444,7 +444,7 @@ static struct bfq_io_cq *bfq_bic_lookup(struct request_queue *q)
                return NULL;
 
        spin_lock_irqsave(&q->queue_lock, flags);
-       icq = icq_to_bic(ioc_lookup_icq(current->io_context, q));
+       icq = icq_to_bic(ioc_lookup_icq(q));
        spin_unlock_irqrestore(&q->queue_lock, flags);
 
        return icq;

diff --git a/block/blk-ioc.c b/block/blk-ioc.c
index c56648f..536fb49 100644 (file)
--- 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);
        }
 

diff --git a/block/blk.h b/block/blk.h
index 187cb26..3be0fdf 100644 (file)
--- a/block/blk.h
+++ b/block/blk.h
@@ -364,7 +364,7 @@ static inline unsigned int bio_aligned_discard_max_sectors(
  * Internal io_context interface
  */
 struct io_cq *ioc_find_get_icq(struct request_queue *q);
-struct io_cq *ioc_lookup_icq(struct io_context *ioc, struct request_queue *q);
+struct io_cq *ioc_lookup_icq(struct request_queue *q);
 void ioc_clear_queue(struct request_queue *q);
 
 #ifdef CONFIG_BLK_DEV_THROTTLING_LOW