leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

btrfs: backref, add unode_aux_to_inode_list helper

Browse Source 
Replacing the double cast and ternary conditional with a helper makes
the code easier on the eyes.

Signed-off-by: Jeff Mahoney <jeffm@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
Jeff Mahoney 2017-06-28 21:56:56 -06:00 committed by David Sterba
parent 73980becae
commit 4dae077a83
1 changed files with 11 additions and 5 deletions

16
fs/btrfs/backref.c
View File

@ -682,6 +682,14 @@ out:
return ret; return ret;
} }
static struct extent_inode_elem *
unode_aux_to_inode_list(struct ulist_node *node)
{
if (!node)
return NULL;
return (struct extent_inode_elem *)(uintptr_t)node->aux;
}
/* /*
* resolve all indirect backrefs from the list * resolve all indirect backrefs from the list
*/ */
@ -736,8 +744,7 @@ static int __resolve_indirect_refs(struct btrfs_fs_info *fs_info,
ULIST_ITER_INIT(&uiter); ULIST_ITER_INIT(&uiter);
node = ulist_next(parents, &uiter); node = ulist_next(parents, &uiter);
ref->parent = node ? node->val : 0; ref->parent = node ? node->val : 0;
ref->inode_list = node ? ref->inode_list = unode_aux_to_inode_list(node);
(struct extent_inode_elem *)(uintptr_t)node->aux : NULL;
/* additional parents require new refs being added here */ /* additional parents require new refs being added here */
while ((node = ulist_next(parents, &uiter))) { while ((node = ulist_next(parents, &uiter))) {
@ -749,8 +756,7 @@ static int __resolve_indirect_refs(struct btrfs_fs_info *fs_info,
} }
memcpy(new_ref, ref, sizeof(*ref)); memcpy(new_ref, ref, sizeof(*ref));
new_ref->parent = node->val; new_ref->parent = node->val;
new_ref->inode_list = (struct extent_inode_elem *) new_ref->inode_list = unode_aux_to_inode_list(node);
(uintptr_t)node->aux;
list_add(&new_ref->list, &ref->list); list_add(&new_ref->list, &ref->list);
} }
ulist_reinit(parents); ulist_reinit(parents);
@ -1476,7 +1482,7 @@ static void free_leaf_list(struct ulist *blocks)
while ((node = ulist_next(blocks, &uiter))) { while ((node = ulist_next(blocks, &uiter))) {
if (!node->aux) if (!node->aux)
continue; continue;
eie = (struct extent_inode_elem *)(uintptr_t)node->aux; eie = unode_aux_to_inode_list(node);
free_inode_elem_list(eie); free_inode_elem_list(eie);
node->aux = 0; node->aux = 0;
} }