Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-09 23:00:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

btrfs: clean up header members offsets in write helpers

Browse Source 
Move header offsetof() to the expression that calculates the address so
it's part of get_eb_offset_in_page where the 2nd parameter is the member
offset.

Reviewed-by: Qu Wenruo <wqu@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
David Sterba 2020-09-21 22:07:14 +02:00
parent dfd29eed4a
commit 24880be59c
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
fs/btrfs/extent_io.c
View File

@ -6519,9 +6519,10 @@ void write_extent_buffer_chunk_tree_uuid(const struct extent_buffer *eb,
char *kaddr; char *kaddr;
assert_eb_page_uptodate(eb, eb->pages[0]); assert_eb_page_uptodate(eb, eb->pages[0]);
kaddr = page_address(eb->pages[0]) + get_eb_offset_in_page(eb, 0); kaddr = page_address(eb->pages[0]) +
memcpy(kaddr + offsetof(struct btrfs_header, chunk_tree_uuid), srcv, get_eb_offset_in_page(eb, offsetof(struct btrfs_header,
BTRFS_FSID_SIZE); chunk_tree_uuid));
memcpy(kaddr, srcv, BTRFS_FSID_SIZE);
} }
void write_extent_buffer_fsid(const struct extent_buffer *eb, const void *srcv) void write_extent_buffer_fsid(const struct extent_buffer *eb, const void *srcv)
@ -6529,9 +6530,9 @@ void write_extent_buffer_fsid(const struct extent_buffer *eb, const void *srcv)
char *kaddr; char *kaddr;
assert_eb_page_uptodate(eb, eb->pages[0]); assert_eb_page_uptodate(eb, eb->pages[0]);
kaddr = page_address(eb->pages[0]) + get_eb_offset_in_page(eb, 0); kaddr = page_address(eb->pages[0]) +
memcpy(kaddr + offsetof(struct btrfs_header, fsid), srcv, get_eb_offset_in_page(eb, offsetof(struct btrfs_header, fsid));
BTRFS_FSID_SIZE); memcpy(kaddr, srcv, BTRFS_FSID_SIZE);
} }
void write_extent_buffer(const struct extent_buffer *eb, const void *srcv, void write_extent_buffer(const struct extent_buffer *eb, const void *srcv,