lkml.org 
[lkml]   [2020]   [Jun]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.7 331/477] blktrace: use errno instead of bi_status
    Date
    From: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>

    [ Upstream commit 48bc3cd3e07a1486f45d9971c75d6090976c3b1b ]

    In blk_add_trace_spliti() blk_add_trace_bio_remap() use
    blk_status_to_errno() to pass the error instead of pasing the bi_status.
    This fixes the sparse warning.

    Signed-off-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
    Signed-off-by: Jens Axboe <axboe@kernel.dk>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    kernel/trace/blktrace.c | 9 ++++++---
    1 file changed, 6 insertions(+), 3 deletions(-)

    diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c
    index ca39dc3230cb3..c6d59a457f50c 100644
    --- a/kernel/trace/blktrace.c
    +++ b/kernel/trace/blktrace.c
    @@ -995,8 +995,10 @@ static void blk_add_trace_split(void *ignore,

    __blk_add_trace(bt, bio->bi_iter.bi_sector,
    bio->bi_iter.bi_size, bio_op(bio), bio->bi_opf,
    - BLK_TA_SPLIT, bio->bi_status, sizeof(rpdu),
    - &rpdu, blk_trace_bio_get_cgid(q, bio));
    + BLK_TA_SPLIT,
    + blk_status_to_errno(bio->bi_status),
    + sizeof(rpdu), &rpdu,
    + blk_trace_bio_get_cgid(q, bio));
    }
    rcu_read_unlock();
    }
    @@ -1033,7 +1035,8 @@ static void blk_add_trace_bio_remap(void *ignore,
    r.sector_from = cpu_to_be64(from);

    __blk_add_trace(bt, bio->bi_iter.bi_sector, bio->bi_iter.bi_size,
    - bio_op(bio), bio->bi_opf, BLK_TA_REMAP, bio->bi_status,
    + bio_op(bio), bio->bi_opf, BLK_TA_REMAP,
    + blk_status_to_errno(bio->bi_status),
    sizeof(r), &r, blk_trace_bio_get_cgid(q, bio));
    rcu_read_unlock();
    }
    --
    2.25.1


    \
     
     \ /
      Last update: 2020-06-23 23:30    [W:4.162 / U:0.132 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site