diff options
author | Christoph Hellwig <hch@lst.de> | 2017-06-03 03:38:06 -0400 |
---|---|---|
committer | Jens Axboe <axboe@fb.com> | 2017-06-09 11:27:32 -0400 |
commit | 4e4cbee93d56137ebff722be022cae5f70ef84fb (patch) | |
tree | 4fa7345155599fc6bdd653fca8c5224ddf90a5be /kernel/trace/blktrace.c | |
parent | fc17b6534eb8395f0b3133eb31d87deec32c642b (diff) |
block: switch bios to blk_status_t
Replace bi_error with a new bi_status to allow for a clear conversion.
Note that device mapper overloaded bi_error with a private value, which
we'll have to keep arround at least for now and thus propagate to a
proper blk_status_t value.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'kernel/trace/blktrace.c')
-rw-r--r-- | kernel/trace/blktrace.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c index 193c5f5e3f79..bc364f86100a 100644 --- a/kernel/trace/blktrace.c +++ b/kernel/trace/blktrace.c | |||
@@ -867,7 +867,7 @@ static void blk_add_trace_split(void *ignore, | |||
867 | 867 | ||
868 | __blk_add_trace(bt, bio->bi_iter.bi_sector, | 868 | __blk_add_trace(bt, bio->bi_iter.bi_sector, |
869 | bio->bi_iter.bi_size, bio_op(bio), bio->bi_opf, | 869 | bio->bi_iter.bi_size, bio_op(bio), bio->bi_opf, |
870 | BLK_TA_SPLIT, bio->bi_error, sizeof(rpdu), | 870 | BLK_TA_SPLIT, bio->bi_status, sizeof(rpdu), |
871 | &rpdu); | 871 | &rpdu); |
872 | } | 872 | } |
873 | } | 873 | } |
@@ -900,7 +900,7 @@ static void blk_add_trace_bio_remap(void *ignore, | |||
900 | r.sector_from = cpu_to_be64(from); | 900 | r.sector_from = cpu_to_be64(from); |
901 | 901 | ||
902 | __blk_add_trace(bt, bio->bi_iter.bi_sector, bio->bi_iter.bi_size, | 902 | __blk_add_trace(bt, bio->bi_iter.bi_sector, bio->bi_iter.bi_size, |
903 | bio_op(bio), bio->bi_opf, BLK_TA_REMAP, bio->bi_error, | 903 | bio_op(bio), bio->bi_opf, BLK_TA_REMAP, bio->bi_status, |
904 | sizeof(r), &r); | 904 | sizeof(r), &r); |
905 | } | 905 | } |
906 | 906 | ||