Merge tag 'trace-v5.6-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt...

[linux.git] / fs / btrfs / ordered-data.h

diff --git a/fs/btrfs/ordered-data.h b/fs/btrfs/ordered-data.h
index 4eb0319a86d7a8cff5efad442f7728fc034eef6c..3beb4da4ab419a155a323e123ca89249c7040cb2 100644 (file)
--- a/fs/btrfs/ordered-data.h
+++ b/fs/btrfs/ordered-data.h
@@ -67,14 +67,13 @@ struct btrfs_ordered_extent {
        /* logical offset in the file */
        u64 file_offset;
 
-       /* disk byte number */
-       u64 start;
-
-       /* ram length of the extent in bytes */
-       u64 len;
-
-       /* extent length on disk */
-       u64 disk_len;
+       /*
+        * These fields directly correspond to the same fields in
+        * btrfs_file_extent_item.
+        */
+       u64 disk_bytenr;
+       u64 num_bytes;
+       u64 disk_num_bytes;
 
        /* number of bytes that still need writing */
        u64 bytes_left;
@@ -161,12 +160,15 @@ int btrfs_dec_test_first_ordered_pending(struct inode *inode,
                                   u64 *file_offset, u64 io_size,
                                   int uptodate);
 int btrfs_add_ordered_extent(struct inode *inode, u64 file_offset,
-                            u64 start, u64 len, u64 disk_len, int type);
+                            u64 disk_bytenr, u64 num_bytes, u64 disk_num_bytes,
+                            int type);
 int btrfs_add_ordered_extent_dio(struct inode *inode, u64 file_offset,
-                                u64 start, u64 len, u64 disk_len, int type);
+                                u64 disk_bytenr, u64 num_bytes,
+                                u64 disk_num_bytes, int type);
 int btrfs_add_ordered_extent_compress(struct inode *inode, u64 file_offset,
-                                     u64 start, u64 len, u64 disk_len,
-                                     int type, int compress_type);
+                                     u64 disk_bytenr, u64 num_bytes,
+                                     u64 disk_num_bytes, int type,
+                                     int compress_type);
 void btrfs_add_ordered_sum(struct btrfs_ordered_extent *entry,
                           struct btrfs_ordered_sum *sum);
 struct btrfs_ordered_extent *btrfs_lookup_ordered_extent(struct inode *inode,