Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c1766dd7 authored by zhong jiang's avatar zhong jiang Committed by David Sterba
Browse files

btrfs: change remove_extent_mapping to return void 



remove_extent_mapping uses the variable "ret" for return value, but it
is not modified after initialzation. Further, I find that any of the
callers do not handle the return value and the callees are only simple
functions so the return values does not need to be passed.

Signed-off-by: default avatarzhong jiang <zhongjiang@huawei.com>
Reviewed-by: default avatarNikolay Borisov <nborisov@suse.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 315bed43

fs/btrfs/extent_map.c

+1 −4
Original line number Diff line number Diff line
@@ -428,16 +428,13 @@ struct extent_map *search_extent_mapping(struct extent_map_tree *tree, 
 * Removes @em from @tree.  No reference counts are dropped, and no checks

 * are done to see if the range is in use

 */

int remove_extent_mapping(struct extent_map_tree *tree, struct extent_map *em)

void remove_extent_mapping(struct extent_map_tree *tree, struct extent_map *em)

{

	int ret = 0;



	WARN_ON(test_bit(EXTENT_FLAG_PINNED, &em->flags));

	rb_erase(&em->rb_node, &tree->map);

	if (!test_bit(EXTENT_FLAG_LOGGING, &em->flags))

		list_del_init(&em->list);

	RB_CLEAR_NODE(&em->rb_node);

	return ret;

}



void replace_extent_mapping(struct extent_map_tree *tree,

fs/btrfs/extent_map.h

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ struct extent_map *lookup_extent_mapping(struct extent_map_tree *tree, 
					 u64 start, u64 len);

int add_extent_mapping(struct extent_map_tree *tree,

		       struct extent_map *em, int modified);

int remove_extent_mapping(struct extent_map_tree *tree, struct extent_map *em);

void remove_extent_mapping(struct extent_map_tree *tree, struct extent_map *em);

void replace_extent_mapping(struct extent_map_tree *tree,

			    struct extent_map *cur,

			    struct extent_map *new,