btrfs: open code trivial helper btrfs_header_chunk_tree_uuid (c4ac7541) · Commits · 戴 / test

The helper btrfs_header_chunk_tree_uuid follows naming convention of other struct accessors but does something compeletly different. As the offsetof calculation is clear in the context of extent buffer operations we can remove it. Reviewed-by:

Johannes Thumshirn <johannes.thumshirn@wdc.com> Signed-off-by:

David Sterba <dsterba@suse.com>

fs/btrfs/ctree.h

+0 −5

Original line number	Diff line number	Diff line
		@@ -1973,11 +1973,6 @@ static inline void btrfs_set_header_backref_rev(struct extent_buffer *eb,
		btrfs_set_header_flags(eb, flags);
		}

		static inline unsigned long btrfs_header_chunk_tree_uuid(const struct extent_buffer *eb)
		{
		return offsetof(struct btrfs_header, chunk_tree_uuid);
		}

		static inline int btrfs_is_leaf(const struct extent_buffer *eb)
		{
		return btrfs_header_level(eb) == 0;

fs/btrfs/disk-io.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -3106,7 +3106,8 @@ int __cold open_ctree(struct super_block sb, struct btrfs_fs_devices fs_device
		chunk_root->commit_root = btrfs_root_node(chunk_root);

		read_extent_buffer(chunk_root->node, fs_info->chunk_tree_uuid,
		btrfs_header_chunk_tree_uuid(chunk_root->node), BTRFS_UUID_SIZE);
		offsetof(struct btrfs_header, chunk_tree_uuid),
		BTRFS_UUID_SIZE);

		ret = btrfs_read_chunk_tree(fs_info);
		if (ret) {

Admin message