diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/backing-dev.h | 1 | ||||
| -rw-r--r-- | include/linux/bio.h | 6 | ||||
| -rw-r--r-- | include/trace/events/bcachefs.h | 6 |
3 files changed, 8 insertions, 5 deletions
diff --git a/include/linux/backing-dev.h b/include/linux/backing-dev.h index a68fca4b..01b2c153 100644 --- a/include/linux/backing-dev.h +++ b/include/linux/backing-dev.h @@ -9,6 +9,7 @@ enum wb_congested_state { }; struct backing_dev_info { + struct list_head bdi_list; unsigned ra_pages; unsigned capabilities; diff --git a/include/linux/bio.h b/include/linux/bio.h index 49d26b53..10cad5cc 100644 --- a/include/linux/bio.h +++ b/include/linux/bio.h @@ -451,11 +451,15 @@ static inline struct bio *bio_clone(struct bio *bio, gfp_t gfp_mask) return bio_clone_bioset(bio, gfp_mask, NULL); } -static inline void bio_init(struct bio *bio) +static inline void bio_init(struct bio *bio, struct bio_vec *table, + unsigned short max_vecs) { memset(bio, 0, sizeof(*bio)); atomic_set(&bio->__bi_remaining, 1); atomic_set(&bio->__bi_cnt, 1); + + bio->bi_io_vec = table; + bio->bi_max_vecs = max_vecs; } #endif /* __LINUX_BIO_H */ diff --git a/include/trace/events/bcachefs.h b/include/trace/events/bcachefs.h index 7dea9d63..06cb5ff3 100644 --- a/include/trace/events/bcachefs.h +++ b/include/trace/events/bcachefs.h @@ -90,8 +90,7 @@ DECLARE_EVENT_CLASS(bio, __entry->dev = bio->bi_bdev->bd_dev; __entry->sector = bio->bi_iter.bi_sector; __entry->nr_sector = bio->bi_iter.bi_size >> 9; - blk_fill_rwbs(__entry->rwbs, bio_op(bio), bio->bi_opf, - bio->bi_iter.bi_size); + blk_fill_rwbs(__entry->rwbs, bio->bi_opf, bio->bi_iter.bi_size); ), TP_printk("%d,%d %s %llu + %u", @@ -156,8 +155,7 @@ TRACE_EVENT(write_throttle, __entry->inode = inode; __entry->sector = bio->bi_iter.bi_sector; __entry->nr_sector = bio->bi_iter.bi_size >> 9; - blk_fill_rwbs(__entry->rwbs, bio_op(bio), bio->bi_opf, - bio->bi_iter.bi_size); + blk_fill_rwbs(__entry->rwbs, bio->bi_opf, bio->bi_iter.bi_size); __entry->delay = delay; ), |