lkml.org 
[lkml]   [2022]   [Oct]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 6.0 536/862] RDMA/srp: Fix srp_abort()
    Date
    From: Bart Van Assche <bvanassche@acm.org>

    [ Upstream commit 6dbe4a8dead84de474483910b02ec9e6a10fc1a9 ]

    Fix the code for converting a SCSI command pointer into an SRP request
    pointer.

    Cc: Xiao Yang <yangx.jy@fujitsu.com>
    Fixes: ad215aaea4f9 ("RDMA/srp: Make struct scsi_cmnd and struct srp_request adjacent")
    Signed-off-by: Bart Van Assche <bvanassche@acm.org>
    Link: https://lore.kernel.org/r/20220908233139.3042628-1-bvanassche@acm.org
    Signed-off-by: Leon Romanovsky <leon@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/infiniband/ulp/srp/ib_srp.c | 4 +---
    1 file changed, 1 insertion(+), 3 deletions(-)

    diff --git a/drivers/infiniband/ulp/srp/ib_srp.c b/drivers/infiniband/ulp/srp/ib_srp.c
    index d7f69e593a63..9c9872868aee 100644
    --- a/drivers/infiniband/ulp/srp/ib_srp.c
    +++ b/drivers/infiniband/ulp/srp/ib_srp.c
    @@ -2789,7 +2789,7 @@ static int srp_send_tsk_mgmt(struct srp_rdma_ch *ch, u64 req_tag, u64 lun,
    static int srp_abort(struct scsi_cmnd *scmnd)
    {
    struct srp_target_port *target = host_to_target(scmnd->device->host);
    - struct srp_request *req = (struct srp_request *) scmnd->host_scribble;
    + struct srp_request *req = scsi_cmd_priv(scmnd);
    u32 tag;
    u16 ch_idx;
    struct srp_rdma_ch *ch;
    @@ -2797,8 +2797,6 @@ static int srp_abort(struct scsi_cmnd *scmnd)

    shost_printk(KERN_ERR, target->scsi_host, "SRP abort called\n");

    - if (!req)
    - return SUCCESS;
    tag = blk_mq_unique_tag(scsi_cmd_to_rq(scmnd));
    ch_idx = blk_mq_unique_tag_to_hwq(tag);
    if (WARN_ON_ONCE(ch_idx >= target->ch_count))
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-10-19 11:14    [W:3.668 / U:0.044 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site