Skip to content

Commit

Permalink
btrfs: squash lines for simple wrapper functions
Browse files Browse the repository at this point in the history
Remove unneeded variables and assignments.

Signed-off-by: Masahiro Yamada <[email protected]>
Reviewed-by: David Sterba <[email protected]>
Signed-off-by: David Sterba <[email protected]>
  • Loading branch information
masahir0y authored and kdave committed Sep 26, 2016
1 parent 6b722c1 commit e2c8990
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 28 deletions.
7 changes: 2 additions & 5 deletions fs/btrfs/check-integrity.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
&btrfsic_dev_state_hashtable);
return ds;
return btrfsic_dev_state_hashtable_lookup(bdev,
&btrfsic_dev_state_hashtable);
}

int btrfsic_submit_bh(int op, int op_flags, struct buffer_head *bh)
Expand Down
4 changes: 1 addition & 3 deletions fs/btrfs/ctree.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

/*
Expand Down
5 changes: 1 addition & 4 deletions fs/btrfs/delayed-inode.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
12 changes: 2 additions & 10 deletions fs/btrfs/extent-tree.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

/*
Expand All @@ -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,
Expand Down
8 changes: 2 additions & 6 deletions fs/btrfs/send.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
sctx->cmp_key, __process_deleted_xattr, sctx);

return ret;
return iterate_dir_item(sctx->parent_root, sctx->right_path,
sctx->cmp_key, __process_deleted_xattr, sctx);
}

struct find_xattr_ctx {
Expand Down

0 comments on commit e2c8990

Please sign in to comment.