android/android_kernel_samsung_sm8650
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

btrfs: preset set/get token with first page and drop condition

Browse Source 
All the set/get helpers first check if the token contains a cached
address. After first use the address is always valid, but the extra
check is done for each call.

The token initialization can optimistically set it to the first extent
buffer page, that we know always exists. Then the condition in all
btrfs_token_*/btrfs_set_token_* can be simplified by removing the
address check from the condition, but for development the assertion
still makes sure it's valid.

Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
David Sterba 2020-04-29 19:29:04 +02:00
parent a31356b9e2
commit 870b388db0
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fs/btrfs/ctree.h
View File

@ -1352,7 +1352,8 @@ static inline void btrfs_init_map_token(struct btrfs_map_token *token,
struct extent_buffer *eb) struct extent_buffer *eb)
{ {
token->eb = eb; token->eb = eb;
token->kaddr = NULL; token->kaddr = page_address(eb->pages[0]);
token->offset = 0;
} }
/* some macros to generate set/get functions for the struct fields. This /* some macros to generate set/get functions for the struct fields. This

8
fs/btrfs/struct-funcs.c
View File

@ -52,8 +52,8 @@ u##bits btrfs_get_token_##bits(struct btrfs_map_token *token, \
u##bits res; \ u##bits res; \
\ \
ASSERT(token); \ ASSERT(token); \
\ ASSERT(token->kaddr); \
if (token->kaddr && token->offset <= offset && \ if (token->offset <= offset && \
(token->offset + PAGE_SIZE >= offset + size)) { \ (token->offset + PAGE_SIZE >= offset + size)) { \
kaddr = token->kaddr; \ kaddr = token->kaddr; \
p = kaddr + part_offset - token->offset; \ p = kaddr + part_offset - token->offset; \
@ -113,8 +113,8 @@ void btrfs_set_token_##bits(struct btrfs_map_token *token, \
int size = sizeof(u##bits); \ int size = sizeof(u##bits); \
\ \
ASSERT(token); \ ASSERT(token); \
\ ASSERT(token->kaddr); \
if (token->kaddr && token->offset <= offset && \ if (token->offset <= offset && \
(token->offset + PAGE_SIZE >= offset + size)) { \ (token->offset + PAGE_SIZE >= offset + size)) { \
kaddr = token->kaddr; \ kaddr = token->kaddr; \
p = kaddr + part_offset - token->offset; \ p = kaddr + part_offset - token->offset; \