Commit 4b117be6 authored by David Sterba's avatar David Sterba
Browse files

btrfs: merge setting ret and return ret 



In many places we have pattern:

	ret = ...;
	return ret;

This can be simplified to a direct return, removing 'ret' if not
otherwise needed. The places in self tests are not converted so we can
add more test cases without changing surrounding code
(extent-map-tests.c:test_case_4()).

Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent d7a5d511

fs/btrfs/block-group.c

+1 −2
Original line number Diff line number Diff line
@@ -1057,8 +1057,7 @@ static int remove_block_group_item(struct btrfs_trans_handle *trans, 
	if (ret < 0)

		return ret;



	ret = btrfs_del_item(trans, root, path);

	return ret;

	return btrfs_del_item(trans, root, path);

}



int btrfs_remove_block_group(struct btrfs_trans_handle *trans,

fs/btrfs/ctree.c

+1 −2
Original line number Diff line number Diff line
@@ -4002,8 +4002,7 @@ int btrfs_split_item(struct btrfs_trans_handle *trans, 
	if (ret)

		return ret;



	ret = split_item(trans, path, new_key, split_offset);

	return ret;

	return split_item(trans, path, new_key, split_offset);

}



/*

fs/btrfs/delayed-inode.c

+2 −2
Original line number Diff line number Diff line
@@ -1137,8 +1137,8 @@ __btrfs_commit_inode_delayed_items(struct btrfs_trans_handle *trans, 
	ret = btrfs_record_root_in_trans(trans, node->root);

	if (ret)

		return ret;

	ret = btrfs_update_delayed_inode(trans, node->root, path, node);

	return ret;



	return btrfs_update_delayed_inode(trans, node->root, path, node);

}



/*

fs/btrfs/disk-io.c

+5 −8
Original line number Diff line number Diff line
@@ -175,7 +175,6 @@ static int btrfs_repair_eb_io_failure(const struct extent_buffer *eb, 
	const u32 step = min(fs_info->nodesize, PAGE_SIZE);

	const u32 nr_steps = eb->len / step;

	phys_addr_t paddrs[BTRFS_MAX_BLOCKSIZE / PAGE_SIZE];

	int ret = 0;



	if (sb_rdonly(fs_info->sb))

		return -EROFS;
@@ -197,9 +196,8 @@ static int btrfs_repair_eb_io_failure(const struct extent_buffer *eb, 
		paddrs[i] = page_to_phys(&folio->page) + offset_in_page(eb->start);

	}



	ret = btrfs_repair_io_failure(fs_info, 0, eb->start, eb->len, eb->start,

				      paddrs, step, mirror_num);

	return ret;

	return btrfs_repair_io_failure(fs_info, 0, eb->start, eb->len,

				       eb->start, paddrs, step, mirror_num);

}



/*
@@ -2145,11 +2143,10 @@ static int load_global_roots(struct btrfs_root *tree_root) 
		return ret;

	if (!btrfs_fs_compat_ro(tree_root->fs_info, FREE_SPACE_TREE))

		return ret;

	ret = load_global_roots_objectid(tree_root, path,



	return load_global_roots_objectid(tree_root, path,

					  BTRFS_FREE_SPACE_TREE_OBJECTID,

					  "free space");



	return ret;

}



static int btrfs_read_roots(struct btrfs_fs_info *fs_info)

fs/btrfs/extent-io-tree.c

+2 −5
Original line number Diff line number Diff line
@@ -187,8 +187,6 @@ static int add_extent_changeset(struct extent_state *state, u32 bits, 
				 struct extent_changeset *changeset,

				 int set)

{

	int ret;



	if (!changeset)

		return 0;

	if (set && (state->state & bits) == bits)
@@ -196,9 +194,8 @@ static int add_extent_changeset(struct extent_state *state, u32 bits, 
	if (!set && (state->state & bits) == 0)

		return 0;

	changeset->bytes_changed += state->end - state->start + 1;

	ret = ulist_add(&changeset->range_changed, state->start, state->end,

			GFP_ATOMIC);

	return ret;



	return ulist_add(&changeset->range_changed, state->start, state->end, GFP_ATOMIC);

}



static inline struct extent_state *next_state(struct extent_state *state)