lkml.org 
[lkml]   [2017]   [Dec]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL for 3.18 39/59] target:fix condition return in core_pr_dump_initiator_port()
    Date
    From: tangwenji <tang.wenji@zte.com.cn>

    [ Upstream commit 24528f089d0a444070aa4f715ace537e8d6bf168 ]

    When is pr_reg->isid_present_at_reg is false,this function should return.

    This fixes a regression originally introduced by:

    commit d2843c173ee53cf4c12e7dfedc069a5bc76f0ac5
    Author: Andy Grover <agrover@redhat.com>
    Date: Thu May 16 10:40:55 2013 -0700

    target: Alter core_pr_dump_initiator_port for ease of use

    Signed-off-by: tangwenji <tang.wenji@zte.com.cn>
    Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
    Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
    ---
    drivers/target/target_core_pr.c | 4 +++-
    1 file changed, 3 insertions(+), 1 deletion(-)

    diff --git a/drivers/target/target_core_pr.c b/drivers/target/target_core_pr.c
    index 45837a4e950d..cba541860e70 100644
    --- a/drivers/target/target_core_pr.c
    +++ b/drivers/target/target_core_pr.c
    @@ -58,8 +58,10 @@ void core_pr_dump_initiator_port(
    char *buf,
    u32 size)
    {
    - if (!pr_reg->isid_present_at_reg)
    + if (!pr_reg->isid_present_at_reg) {
    buf[0] = '\0';
    + return;
    + }

    snprintf(buf, size, ",i,0x%s", pr_reg->pr_reg_isid);
    }
    --
    2.11.0
    \
     
     \ /
      Last update: 2017-12-07 17:21    [W:4.127 / U:0.132 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site