Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

btrfs: remove BTRFS_LEAF_DATA_OFFSET

This is simply the same thing as btrfs_item_nr_offset(leaf, 0), so
remove this helper and replace it's usage with the above statement.

Signed-off-by: Josef Bacik <josef@toxicpanda.com>
Signed-off-by: David Sterba <dsterba@suse.com>

authored by

Josef Bacik and committed by
David Sterba
8009adf3 637e3b48

+7 -9
+2 -4
fs/btrfs/accessors.h
··· 9 9 unsigned long offset; 10 10 }; 11 11 12 - #define BTRFS_LEAF_DATA_OFFSET offsetof(struct btrfs_leaf, items) 13 - 14 12 void btrfs_init_map_token(struct btrfs_map_token *token, struct extent_buffer *eb); 15 13 16 14 /* ··· 1026 1028 1027 1029 /* Cast into the data area of the leaf. */ 1028 1030 #define btrfs_item_ptr(leaf, slot, type) \ 1029 - ((type *)(BTRFS_LEAF_DATA_OFFSET + btrfs_item_offset(leaf, slot))) 1031 + ((type *)(btrfs_item_nr_offset(leaf, 0) + btrfs_item_offset(leaf, slot))) 1030 1032 1031 1033 #define btrfs_item_ptr_offset(leaf, slot) \ 1032 - ((unsigned long)(BTRFS_LEAF_DATA_OFFSET + btrfs_item_offset(leaf, slot))) 1034 + ((unsigned long)(btrfs_item_nr_offset(leaf, 0) + btrfs_item_offset(leaf, slot))) 1033 1035 1034 1036 #endif
+4 -4
fs/btrfs/ctree.c
··· 83 83 unsigned long src_offset, 84 84 unsigned long len) 85 85 { 86 - memmove_extent_buffer(leaf, BTRFS_LEAF_DATA_OFFSET + dst_offset, 87 - BTRFS_LEAF_DATA_OFFSET + src_offset, len); 86 + memmove_extent_buffer(leaf, btrfs_item_nr_offset(leaf, 0) + dst_offset, 87 + btrfs_item_nr_offset(leaf, 0) + src_offset, len); 88 88 } 89 89 90 90 /* ··· 106 106 unsigned long dst_offset, 107 107 unsigned long src_offset, unsigned long len) 108 108 { 109 - copy_extent_buffer(dst, src, BTRFS_LEAF_DATA_OFFSET + dst_offset, 110 - BTRFS_LEAF_DATA_OFFSET + src_offset, len); 109 + copy_extent_buffer(dst, src, btrfs_item_nr_offset(dst, 0) + dst_offset, 110 + btrfs_item_nr_offset(src, 0) + src_offset, len); 111 111 } 112 112 113 113 /*
+1 -1
fs/btrfs/extent_io.c
··· 2537 2537 * header 0 1 2 .. N ... data_N .. data_2 data_1 data_0 2538 2538 */ 2539 2539 start = btrfs_item_nr_offset(eb, nritems); 2540 - end = BTRFS_LEAF_DATA_OFFSET; 2540 + end = btrfs_item_nr_offset(eb, 0); 2541 2541 if (nritems == 0) 2542 2542 end += BTRFS_LEAF_DATA_SIZE(eb->fs_info); 2543 2543 else