lkml.org 
[lkml]   [2021]   [Aug]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 09/11] scsi: Set blk_mq_ops.init_request_no_hctx
    Date
    The hctx_idx argument is not used in scsi_mq_init_request(), so set as the
    blk_mq_ops.init_request_no_hctx callback instead.

    Signed-off-by: John Garry <john.garry@huawei.com>
    ---
    drivers/scsi/scsi_lib.c | 6 +++---
    1 file changed, 3 insertions(+), 3 deletions(-)

    diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
    index 7456a26aef51..6ea4d0847970 100644
    --- a/drivers/scsi/scsi_lib.c
    +++ b/drivers/scsi/scsi_lib.c
    @@ -1738,7 +1738,7 @@ static enum blk_eh_timer_return scsi_timeout(struct request *req,
    }

    static int scsi_mq_init_request(struct blk_mq_tag_set *set, struct request *rq,
    - unsigned int hctx_idx, unsigned int numa_node)
    + unsigned int numa_node)
    {
    struct Scsi_Host *shost = set->driver_data;
    struct scsi_cmnd *cmd = blk_mq_rq_to_pdu(rq);
    @@ -1856,7 +1856,7 @@ static const struct blk_mq_ops scsi_mq_ops_no_commit = {
    #ifdef CONFIG_BLK_DEBUG_FS
    .show_rq = scsi_show_rq,
    #endif
    - .init_request = scsi_mq_init_request,
    + .init_request_no_hctx = scsi_mq_init_request,
    .exit_request = scsi_mq_exit_request,
    .initialize_rq_fn = scsi_initialize_rq,
    .cleanup_rq = scsi_cleanup_rq,
    @@ -1886,7 +1886,7 @@ static const struct blk_mq_ops scsi_mq_ops = {
    #ifdef CONFIG_BLK_DEBUG_FS
    .show_rq = scsi_show_rq,
    #endif
    - .init_request = scsi_mq_init_request,
    + .init_request_no_hctx = scsi_mq_init_request,
    .exit_request = scsi_mq_exit_request,
    .initialize_rq_fn = scsi_initialize_rq,
    .cleanup_rq = scsi_cleanup_rq,
    --
    2.26.2
    \
     
     \ /
      Last update: 2021-08-09 16:41    [W:4.248 / U:0.028 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site