btrfs: rename extent_map::orig_block_len to disk_num_bytes

This would make it very obvious that the member just matches
btrfs_file_extent_item::disk_num_bytes.

Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: Filipe Manana <fdmanana@suse.com>
Signed-off-by: Qu Wenruo <wqu@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/extent_map.c b/fs/btrfs/extent_map.c
index 35e163152dbc0f44b3dcf032639d0a4bc50f2f2c..a9d60d1eade9867cffb568f5adddb6fa7edd2b82 100644 (file)
--- a/fs/btrfs/extent_map.c
+++ b/fs/btrfs/extent_map.c
@@ -785,14 +785,14 @@ void btrfs_drop_extent_map_range(struct btrfs_inode *inode, u64 start, u64 end,
                                        split->block_len = em->block_len;
                                else
                                        split->block_len = split->len;
-                               split->orig_block_len = max(split->block_len,
-                                               em->orig_block_len);
+                               split->disk_num_bytes = max(split->block_len,
+                                                           em->disk_num_bytes);
                                split->ram_bytes = em->ram_bytes;
                        } else {
                                split->orig_start = split->start;
                                split->block_len = 0;
                                split->block_start = em->block_start;
-                               split->orig_block_len = 0;
+                               split->disk_num_bytes = 0;
                                split->ram_bytes = split->len;
                        }
 
@@ -817,8 +817,8 @@ void btrfs_drop_extent_map_range(struct btrfs_inode *inode, u64 start, u64 end,
                        split->generation = gen;
 
                        if (em->block_start < EXTENT_MAP_LAST_BYTE) {
-                               split->orig_block_len = max(em->block_len,
-                                                   em->orig_block_len);
+                               split->disk_num_bytes = max(em->block_len,
+                                                           em->disk_num_bytes);
 
                                split->ram_bytes = em->ram_bytes;
                                if (compressed) {
@@ -835,7 +835,7 @@ void btrfs_drop_extent_map_range(struct btrfs_inode *inode, u64 start, u64 end,
                                split->ram_bytes = split->len;
                                split->orig_start = split->start;
                                split->block_len = 0;
-                               split->orig_block_len = 0;
+                               split->disk_num_bytes = 0;
                        }
 
                        if (extent_map_in_tree(em)) {
@@ -992,7 +992,7 @@ int split_extent_map(struct btrfs_inode *inode, u64 start, u64 len, u64 pre,
        split_pre->orig_start = split_pre->start;
        split_pre->block_start = new_logical;
        split_pre->block_len = split_pre->len;
-       split_pre->orig_block_len = split_pre->block_len;
+       split_pre->disk_num_bytes = split_pre->block_len;
        split_pre->ram_bytes = split_pre->len;
        split_pre->flags = flags;
        split_pre->generation = em->generation;
@@ -1010,7 +1010,7 @@ int split_extent_map(struct btrfs_inode *inode, u64 start, u64 len, u64 pre,
        split_mid->orig_start = split_mid->start;
        split_mid->block_start = em->block_start + pre;
        split_mid->block_len = split_mid->len;
-       split_mid->orig_block_len = split_mid->block_len;
+       split_mid->disk_num_bytes = split_mid->block_len;
        split_mid->ram_bytes = split_mid->len;
        split_mid->flags = flags;
        split_mid->generation = em->generation;

diff --git a/fs/btrfs/extent_map.h b/fs/btrfs/extent_map.h
index 9144721b88a55e7328cb62a6b61d1c6f40a368b3..2b7bbffd594bfff60b1ec3b2c0a8b14ed1d64eca 100644 (file)
--- a/fs/btrfs/extent_map.h
+++ b/fs/btrfs/extent_map.h
@@ -74,7 +74,7 @@ struct extent_map {
         * The full on-disk extent length, matching
         * btrfs_file_extent_item::disk_num_bytes.
         */
-       u64 orig_block_len;
+       u64 disk_num_bytes;
 
        /*
         * The decompressed size of the whole on-disk extent, matching

diff --git a/fs/btrfs/file-item.c b/fs/btrfs/file-item.c
index f3ed78e21fa42ab0fac86aa042593c0b7d0b35ea..430dce44ebd2ee018b3cc38d4e0c8f4c90f25f6c 100644 (file)
--- a/fs/btrfs/file-item.c
+++ b/fs/btrfs/file-item.c
@@ -1295,7 +1295,7 @@ void btrfs_extent_item_to_extent_map(struct btrfs_inode *inode,
                em->len = btrfs_file_extent_end(path) - extent_start;
                em->orig_start = extent_start -
                        btrfs_file_extent_offset(leaf, fi);
-               em->orig_block_len = btrfs_file_extent_disk_num_bytes(leaf, fi);
+               em->disk_num_bytes = btrfs_file_extent_disk_num_bytes(leaf, fi);
                bytenr = btrfs_file_extent_disk_bytenr(leaf, fi);
                if (bytenr == 0) {
                        em->block_start = EXTENT_MAP_HOLE;
@@ -1304,7 +1304,7 @@ void btrfs_extent_item_to_extent_map(struct btrfs_inode *inode,
                if (compress_type != BTRFS_COMPRESS_NONE) {
                        extent_map_set_compression(em, compress_type);
                        em->block_start = bytenr;
-                       em->block_len = em->orig_block_len;
+                       em->block_len = em->disk_num_bytes;
                } else {
                        bytenr += btrfs_file_extent_offset(leaf, fi);
                        em->block_start = bytenr;

diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c
index 71f27f8fe7d21468406d9d5b00f36e256a1c3994..ebb769777da4f3207d76367cfc17842c9cff25ac 100644 (file)
--- a/fs/btrfs/file.c
+++ b/fs/btrfs/file.c
@@ -2350,7 +2350,7 @@ out:
 
                hole_em->block_start = EXTENT_MAP_HOLE;
                hole_em->block_len = 0;
-               hole_em->orig_block_len = 0;
+               hole_em->disk_num_bytes = 0;
                hole_em->generation = trans->transid;
 
                ret = btrfs_replace_extent_map_range(inode, hole_em, true);

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index a1f8ea7768b8557a771fdddde733817765cc0679..0ab5f8237d0842646adbbf1ba871dfd97ea0b332 100644 (file)
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -140,7 +140,7 @@ static noinline int run_delalloc_cow(struct btrfs_inode *inode,
                                     bool pages_dirty);
 static struct extent_map *create_io_em(struct btrfs_inode *inode, u64 start,
                                       u64 len, u64 orig_start, u64 block_start,
-                                      u64 block_len, u64 orig_block_len,
+                                      u64 block_len, u64 disk_num_bytes,
                                       u64 ram_bytes, int compress_type,
                                       int type);
 
@@ -5002,7 +5002,7 @@ int btrfs_cont_expand(struct btrfs_inode *inode, loff_t oldsize, loff_t size)
 
                        hole_em->block_start = EXTENT_MAP_HOLE;
                        hole_em->block_len = 0;
-                       hole_em->orig_block_len = 0;
+                       hole_em->disk_num_bytes = 0;
                        hole_em->ram_bytes = hole_size;
                        hole_em->generation = btrfs_get_fs_generation(fs_info);
 
@@ -7331,7 +7331,7 @@ static int lock_extent_direct(struct inode *inode, u64 lockstart, u64 lockend,
 /* The callers of this must take lock_extent() */
 static struct extent_map *create_io_em(struct btrfs_inode *inode, u64 start,
                                       u64 len, u64 orig_start, u64 block_start,
-                                      u64 block_len, u64 orig_block_len,
+                                      u64 block_len, u64 disk_num_bytes,
                                       u64 ram_bytes, int compress_type,
                                       int type)
 {
@@ -7363,7 +7363,7 @@ static struct extent_map *create_io_em(struct btrfs_inode *inode, u64 start,
                ASSERT(block_len == len);
 
                /* COW results a new extent matching our file extent size. */
-               ASSERT(orig_block_len == len);
+               ASSERT(disk_num_bytes == len);
                ASSERT(ram_bytes == len);
 
                /* Since it's a new extent, we should not have any offset. */
@@ -7390,7 +7390,7 @@ static struct extent_map *create_io_em(struct btrfs_inode *inode, u64 start,
        em->len = len;
        em->block_len = block_len;
        em->block_start = block_start;
-       em->orig_block_len = orig_block_len;
+       em->disk_num_bytes = disk_num_bytes;
        em->ram_bytes = ram_bytes;
        em->generation = -1;
        em->flags |= EXTENT_FLAG_PINNED;
@@ -9567,7 +9567,7 @@ static int __btrfs_prealloc_file_range(struct inode *inode, int mode,
                em->len = ins.offset;
                em->block_start = ins.objectid;
                em->block_len = ins.offset;
-               em->orig_block_len = ins.offset;
+               em->disk_num_bytes = ins.offset;
                em->ram_bytes = ins.offset;
                em->flags |= EXTENT_FLAG_PREALLOC;
                em->generation = trans->transid;

diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c
index 1dc98cb573737a4c97c271c0bd807e38b3399dd8..b6b7955d12dbea686a4c1038328d1ddd85642c83 100644 (file)
--- a/fs/btrfs/tree-log.c
+++ b/fs/btrfs/tree-log.c
@@ -4670,7 +4670,7 @@ static int log_extent_csums(struct btrfs_trans_handle *trans,
        /* If we're compressed we have to save the entire range of csums. */
        if (extent_map_is_compressed(em)) {
                csum_offset = 0;
-               csum_len = max(em->block_len, em->orig_block_len);
+               csum_len = max(em->block_len, em->disk_num_bytes);
        } else {
                csum_offset = mod_start - em->start;
                csum_len = mod_len;
@@ -4720,7 +4720,7 @@ static int log_one_extent(struct btrfs_trans_handle *trans,
        else
                btrfs_set_stack_file_extent_type(&fi, BTRFS_FILE_EXTENT_REG);
 
-       block_len = max(em->block_len, em->orig_block_len);
+       block_len = max(em->block_len, em->disk_num_bytes);
        compress_type = extent_map_compression(em);
        if (compress_type != BTRFS_COMPRESS_NONE) {
                btrfs_set_stack_file_extent_disk_bytenr(&fi, em->block_start);