Commit e2c89907 authored by Masahiro Yamada's avatar Masahiro Yamada Committed by David Sterba
Browse files

btrfs: squash lines for simple wrapper functions 



Remove unneeded variables and assignments.

Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 6b722c17

fs/btrfs/check-integrity.c

+2 −5
Original line number Diff line number Diff line
@@ -2849,11 +2849,8 @@ static void btrfsic_cmp_log_and_dev_bytenr(struct btrfsic_state *state, 
static struct btrfsic_dev_state *btrfsic_dev_state_lookup(

		struct block_device *bdev)

{

	struct btrfsic_dev_state *ds;



	ds = btrfsic_dev_state_hashtable_lookup(bdev,

	return btrfsic_dev_state_hashtable_lookup(bdev,

						  &btrfsic_dev_state_hashtable);

	return ds;

}



int btrfsic_submit_bh(int op, int op_flags, struct buffer_head *bh)

fs/btrfs/ctree.c

+1 −3
Original line number Diff line number Diff line
@@ -45,9 +45,7 @@ static int tree_mod_log_free_eb(struct btrfs_fs_info *fs_info, 


struct btrfs_path *btrfs_alloc_path(void)

{

	struct btrfs_path *path;

	path = kmem_cache_zalloc(btrfs_path_cachep, GFP_NOFS);

	return path;

	return kmem_cache_zalloc(btrfs_path_cachep, GFP_NOFS);

}



/*

fs/btrfs/delayed-inode.c

+1 −4
Original line number Diff line number Diff line
@@ -385,11 +385,8 @@ static struct btrfs_delayed_item *__btrfs_lookup_delayed_insertion_item( 
					struct btrfs_delayed_node *delayed_node,

					struct btrfs_key *key)

{

	struct btrfs_delayed_item *item;



	item = __btrfs_lookup_delayed_item(&delayed_node->ins_root, key,

	return __btrfs_lookup_delayed_item(&delayed_node->ins_root, key,

					   NULL, NULL);

	return item;

}



static int __btrfs_add_delayed_item(struct btrfs_delayed_node *delayed_node,

fs/btrfs/extent-tree.c

+2 −10
Original line number Diff line number Diff line
@@ -730,11 +730,7 @@ static int cache_block_group(struct btrfs_block_group_cache *cache, 
static struct btrfs_block_group_cache *

btrfs_lookup_first_block_group(struct btrfs_fs_info *info, u64 bytenr)

{

	struct btrfs_block_group_cache *cache;



	cache = block_group_cache_tree_search(info, bytenr, 0);



	return cache;

	return block_group_cache_tree_search(info, bytenr, 0);

}



/*
@@ -744,11 +740,7 @@ struct btrfs_block_group_cache *btrfs_lookup_block_group( 
						 struct btrfs_fs_info *info,

						 u64 bytenr)

{

	struct btrfs_block_group_cache *cache;



	cache = block_group_cache_tree_search(info, bytenr, 1);



	return cache;

	return block_group_cache_tree_search(info, bytenr, 1);

}



static struct btrfs_space_info *__find_space_info(struct btrfs_fs_info *info,

fs/btrfs/send.c

+2 −6
Original line number Diff line number Diff line
@@ -4398,12 +4398,8 @@ static int process_new_xattr(struct send_ctx *sctx) 


static int process_deleted_xattr(struct send_ctx *sctx)

{

	int ret;



	ret = iterate_dir_item(sctx->parent_root, sctx->right_path,

	return iterate_dir_item(sctx->parent_root, sctx->right_path,

				sctx->cmp_key, __process_deleted_xattr, sctx);



	return ret;

}



struct find_xattr_ctx {