]> www.infradead.org Git - users/hch/misc.git/commitdiff
btrfs: simplify inline extent end calculation at replay_one_extent()
authorFilipe Manana <fdmanana@suse.com>
Thu, 18 Sep 2025 12:29:16 +0000 (13:29 +0100)
committerDavid Sterba <dsterba@suse.com>
Tue, 23 Sep 2025 06:49:24 +0000 (08:49 +0200)
There is no need to store the extent's ram_bytes in two variables,
further more one of them, named 'size', is used only for the extent's end
offset calculation. So remove the 'size' variable and use 'nbytes' only.

Reviewed-by: Qu Wenruo <wqu@suse.com>
Signed-off-by: Filipe Manana <fdmanana@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
fs/btrfs/tree-log.c

index 96492080fed85a0a6526911eaa8439dea12b5ea7..ac7805d40ab24a4f2511f63a29334add3eedaeb9 100644 (file)
@@ -732,7 +732,6 @@ static noinline int replay_one_extent(struct walk_control *wc)
        struct btrfs_key ins;
        struct btrfs_file_extent_item *item;
        struct btrfs_inode *inode = NULL;
-       unsigned long size;
        int ret = 0;
 
        item = btrfs_item_ptr(wc->log_leaf, wc->log_slot, struct btrfs_file_extent_item);
@@ -745,10 +744,8 @@ static noinline int replay_one_extent(struct walk_control *wc)
                if (btrfs_file_extent_disk_bytenr(wc->log_leaf, item) != 0)
                        nbytes = btrfs_file_extent_num_bytes(wc->log_leaf, item);
        } else if (found_type == BTRFS_FILE_EXTENT_INLINE) {
-               size = btrfs_file_extent_ram_bytes(wc->log_leaf, item);
                nbytes = btrfs_file_extent_ram_bytes(wc->log_leaf, item);
-               extent_end = ALIGN(start + size,
-                                  fs_info->sectorsize);
+               extent_end = ALIGN(start + nbytes, fs_info->sectorsize);
        } else {
                btrfs_abort_log_replay(wc, -EUCLEAN,
                       "unexpected extent type=%d root=%llu inode=%llu offset=%llu",