diff options
author | Mark Brown <broonie@kernel.org> | 2018-08-28 19:03:57 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2018-08-28 19:03:57 +0100 |
commit | 6e2d6b2728fcb408eabd7991804f8cb33ff59f20 (patch) | |
tree | 18dc3fc5bd55fa9ff92430e4ab8353de6c5c0e55 /include/trace/events/btrfs.h | |
parent | 6f0a256253f48095ba2e5bcdfbed41f21643c105 (diff) | |
parent | 5b394b2ddf0347bef56e50c69a58773c94343ff3 (diff) |
Merge tag 'v4.19-rc1' into asoc-4.19
Linux 4.19-rc1
Diffstat (limited to 'include/trace/events/btrfs.h')
-rw-r--r-- | include/trace/events/btrfs.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/trace/events/btrfs.h b/include/trace/events/btrfs.h index 39b94ec965be..b401c4e36394 100644 --- a/include/trace/events/btrfs.h +++ b/include/trace/events/btrfs.h @@ -374,7 +374,7 @@ DECLARE_EVENT_CLASS( __entry->extent_type = btrfs_file_extent_type(l, fi); __entry->compression = btrfs_file_extent_compression(l, fi); __entry->extent_start = start; - __entry->extent_end = (start + btrfs_file_extent_inline_len(l, slot, fi)); + __entry->extent_end = (start + btrfs_file_extent_ram_bytes(l, fi)); ), TP_printk_btrfs( @@ -433,7 +433,6 @@ DEFINE_EVENT( { (1 << BTRFS_ORDERED_DIRECT), "DIRECT" }, \ { (1 << BTRFS_ORDERED_IOERR), "IOERR" }, \ { (1 << BTRFS_ORDERED_UPDATED_ISIZE), "UPDATED_ISIZE" }, \ - { (1 << BTRFS_ORDERED_LOGGED_CSUM), "LOGGED_CSUM" }, \ { (1 << BTRFS_ORDERED_TRUNCATED), "TRUNCATED" }) |