| @@ -830,8 +830,8 @@ static void blk_add_trace_split(struct request_queue *q, struct bio *bio, · 829 unmodified lines |
| 830 | 830 | * @q: queue the io is for |
| 831 | 831 | * @bio: the source bio |
| 832 | 832 | * @dev: target device |
| 833 | | − * @from: source sector |
| 834 | 833 | * @to: target sector |
| 834 | + * @from: source sector |
| 835 | 835 | * |
| 836 | 836 | * Description: |
| 837 | 837 | * Device mapper or raid target sometimes need to split a bio because |
| @@ -839,7 +839,7 @@ static void blk_add_trace_split(struct request_queue *q, struct bio *bio, · 1 unmodified line |
| 839 | 839 | * |
| 840 | 840 | **/ |
| 841 | 841 | static void blk_add_trace_remap(struct request_queue *q, struct bio *bio, |
| 842 | | − dev_t dev, sector_t from, sector_t to) |
| 842 | + dev_t dev, sector_t to, sector_t from) |
| 843 | 843 | { |
| 844 | 844 | struct blk_trace *bt = q->blk_trace; |
| 845 | 845 | struct blk_io_trace_remap r; |
| @@ -847,9 +847,9 @@ static void blk_add_trace_remap(struct request_queue *q, struct bio *bio, · 1 unmodified line |
| 847 | 847 | if (likely(!bt)) |
| 848 | 848 | return; |
| 849 | 849 | |
| 850 | | − r.device = cpu_to_be32(dev); |
| 851 | | − r.device_from = cpu_to_be32(bio->bi_bdev->bd_dev); |
| 852 | | − r.sector = cpu_to_be64(to); |
| 850 | + r.device_from = cpu_to_be32(dev); |
| 851 | + r.device_to = cpu_to_be32(bio->bi_bdev->bd_dev); |
| 852 | + r.sector_from = cpu_to_be64(from); |
| 853 | 853 | |
| 854 | 854 | __blk_add_trace(bt, from, bio->bi_size, bio->bi_rw, BLK_TA_REMAP, |
| 855 | 855 | !bio_flagged(bio, BIO_UPTODATE), sizeof(r), &r); |
| @@ -1028,11 +1028,11 @@ static void get_pdu_remap(const struct trace_entry *ent, · 172 unmodified lines |
| 1028 | 1028 | struct blk_io_trace_remap *r) |
| 1029 | 1029 | { |
| 1030 | 1030 | const struct blk_io_trace_remap *__r = pdu_start(ent); |
| 1031 | | − __u64 sector = __r->sector; |
| 1031 | + __u64 sector_from = __r->sector_from; |
| 1032 | 1032 | |
| 1033 | | − r->device = be32_to_cpu(__r->device); |
| 1034 | 1033 | r->device_from = be32_to_cpu(__r->device_from); |
| 1035 | | − r->sector = be64_to_cpu(sector); |
| 1034 | + r->device_to = be32_to_cpu(__r->device_to); |
| 1035 | + r->sector_from = be64_to_cpu(sector_from); |
| 1036 | 1036 | } |
| 1037 | 1037 | |
| 1038 | 1038 | typedef int (blk_log_action_t) (struct trace_iterator *iter, const char *act); |
| @@ -1148,13 +1148,13 @@ static int blk_log_with_error(struct trace_seq *s, · 109 unmodified lines |
| 1148 | 1148 | |
| 1149 | 1149 | static int blk_log_remap(struct trace_seq *s, const struct trace_entry *ent) |
| 1150 | 1150 | { |
| 1151 | | − struct blk_io_trace_remap r = { .device = 0, }; |
| 1151 | + struct blk_io_trace_remap r = { .device_from = 0, }; |
| 1152 | 1152 | |
| 1153 | 1153 | get_pdu_remap(ent, &r); |
| 1154 | 1154 | return trace_seq_printf(s, "%llu + %u <- (%d,%d) %llu\n", |
| 1155 | | − t_sector(ent), |
| 1156 | | − t_sec(ent), MAJOR(r.device), MINOR(r.device), |
| 1157 | | − (unsigned long long)r.sector); |
| 1155 | + t_sector(ent), t_sec(ent), |
| 1156 | + MAJOR(r.device_from), MINOR(r.device_from), |
| 1157 | + (unsigned long long)r.sector_from); |
| 1158 | 1158 | } |
| 1159 | 1159 | |
| 1160 | 1160 | static int blk_log_plug(struct trace_seq *s, const struct trace_entry *ent) |