| From 52a35972d23801a230eb54f9e797f67a0c600827 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Thu, 4 Jun 2020 00:13:28 -0700 |
| Subject: blktrace: use errno instead of bi_status |
| |
| 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 a60c09e0bda87..30a98156f4743 100644 |
| --- a/kernel/trace/blktrace.c |
| +++ b/kernel/trace/blktrace.c |
| @@ -1022,8 +1022,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(); |
| } |
| @@ -1060,7 +1062,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 |
| |