diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2019-06-30 16:35:37 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2022-10-14 04:59:38 -0400 |
| commit | 29f20baecf850c6381a48ceb57dcefac8e15bd5b (patch) | |
| tree | 0436e075bd8499e67ae70887e3b7b1ee6f823394 /include | |
| parent | d91a7b6ebca99e6140c913038614f153bc4d4610 (diff) | |
bcachefs: Fixes for 4.19bcachefs-v4.19-backport-2.0
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/generic-radix-tree.h | 1 | ||||
| -rw-r--r-- | include/trace/events/bcachefs.h | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/include/linux/generic-radix-tree.h b/include/linux/generic-radix-tree.h index c74b7376990d..5aa1986128df 100644 --- a/include/linux/generic-radix-tree.h +++ b/include/linux/generic-radix-tree.h @@ -40,7 +40,6 @@ #include <linux/bug.h> #include <linux/limits.h> #include <linux/log2.h> -#include <linux/math.h> #include <linux/types.h> struct genradix_root; diff --git a/include/trace/events/bcachefs.h b/include/trace/events/bcachefs.h index d3d9e965e702..907649033621 100644 --- a/include/trace/events/bcachefs.h +++ b/include/trace/events/bcachefs.h @@ -104,10 +104,10 @@ DECLARE_EVENT_CLASS(bio, ), TP_fast_assign( - __entry->dev = bio->bi_bdev ? bio_dev(bio) : 0; + __entry->dev = bio->bi_disk ? bio_dev(bio) : 0; __entry->sector = bio->bi_iter.bi_sector; __entry->nr_sector = bio->bi_iter.bi_size >> 9; - blk_fill_rwbs(__entry->rwbs, bio->bi_opf); + blk_fill_rwbs(__entry->rwbs, bio->bi_opf, bio->bi_iter.bi_size); ), TP_printk("%d,%d %s %llu + %u", |