Commit 730c374e authored by Qu Wenruo's avatar Qu Wenruo Committed by David Sterba
Browse files

btrfs: use write_extent_buffer() to implement write_extent_buffer_*id() 



Helpers write_extent_buffer_chunk_tree_uuid() and
write_extent_buffer_fsid(), they can be implemented by
write_extent_buffer().

These two helpers are not that frequently used, they only get called
during initialization of a new tree block.  There is not much need for
those slightly optimized versions.  And since they can be easily
converted to one write_extent_buffer() call, define them as inline
helpers.

This would make later page/folio switch much easier, as all change only
need to happen in write_extent_buffer().

Reviewed-by: default avatarSweet Tea Dorminy <sweettea-kernel@dorminy.me>
Signed-off-by: default avatarQu Wenruo <wqu@suse.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent cb22964f

fs/btrfs/extent_io.c

+0 −22
Original line number Diff line number Diff line
@@ -4129,28 +4129,6 @@ static void assert_eb_page_uptodate(const struct extent_buffer *eb, 
	}

}



void write_extent_buffer_chunk_tree_uuid(const struct extent_buffer *eb,

		const void *srcv)

{

	char *kaddr;



	assert_eb_page_uptodate(eb, eb->pages[0]);

	kaddr = page_address(eb->pages[0]) +

		get_eb_offset_in_page(eb, offsetof(struct btrfs_header,

						   chunk_tree_uuid));

	memcpy(kaddr, srcv, BTRFS_FSID_SIZE);

}



void write_extent_buffer_fsid(const struct extent_buffer *eb, const void *srcv)

{

	char *kaddr;



	assert_eb_page_uptodate(eb, eb->pages[0]);

	kaddr = page_address(eb->pages[0]) +

		get_eb_offset_in_page(eb, offsetof(struct btrfs_header, fsid));

	memcpy(kaddr, srcv, BTRFS_FSID_SIZE);

}



void write_extent_buffer(const struct extent_buffer *eb, const void *srcv,

			 unsigned long start, unsigned long len)

{

fs/btrfs/extent_io.h

+16 −3
Original line number Diff line number Diff line
@@ -236,11 +236,24 @@ void read_extent_buffer(const struct extent_buffer *eb, void *dst, 
int read_extent_buffer_to_user_nofault(const struct extent_buffer *eb,

				       void __user *dst, unsigned long start,

				       unsigned long len);

void write_extent_buffer_fsid(const struct extent_buffer *eb, const void *src);

void write_extent_buffer_chunk_tree_uuid(const struct extent_buffer *eb,

		const void *src);

void write_extent_buffer(const struct extent_buffer *eb, const void *src,

			 unsigned long start, unsigned long len);



static inline void write_extent_buffer_chunk_tree_uuid(

		const struct extent_buffer *eb, const void *chunk_tree_uuid)

{

	write_extent_buffer(eb, chunk_tree_uuid,

			    offsetof(struct btrfs_header, chunk_tree_uuid),

			    BTRFS_FSID_SIZE);

}



static inline void write_extent_buffer_fsid(const struct extent_buffer *eb,

					    const void *fsid)

{

	write_extent_buffer(eb, fsid, offsetof(struct btrfs_header, fsid),

			    BTRFS_FSID_SIZE);

}



void copy_extent_buffer_full(const struct extent_buffer *dst,

			     const struct extent_buffer *src);

void copy_extent_buffer(const struct extent_buffer *dst,