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: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/block-group.c b/fs/btrfs/block-group.c
index 08b14449fabeba6d0e8d484380c2a6acc21eb32f..3864aec520b3f7a2a215e649df9bf8f6b80762a2 100644 (file)
--- a/fs/btrfs/block-group.c
+++ b/fs/btrfs/block-group.c
@@ -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,

diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c
index e245b8c4c3405e32267c4883b6c2759a6e4acc52..7267b250266579c3797506465d75be2fc3160421 100644 (file)
--- a/fs/btrfs/ctree.c
+++ b/fs/btrfs/ctree.c
@@ -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);
 }
 
 /*

diff --git a/fs/btrfs/delayed-inode.c b/fs/btrfs/delayed-inode.c
index 4b7d9015e0dadea2a93e3754fb942f410ccad234..2286bee2c6d3a897b6be13d0e5f8709555745f6b 100644 (file)
--- a/fs/btrfs/delayed-inode.c
+++ b/fs/btrfs/delayed-inode.c
@@ -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);
 }
 
 /*

diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index 12d91407bb605c1b4c00380a9acf8198e0f58130..5d8dcaaf11fe296597310b84c75ade98d39fce94 100644 (file)
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -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,
-                                        BTRFS_FREE_SPACE_TREE_OBJECTID,
-                                        "free space");
 
-       return ret;
+       return load_global_roots_objectid(tree_root, path,
+                                         BTRFS_FREE_SPACE_TREE_OBJECTID,
+                                         "free space");
 }
 
 static int btrfs_read_roots(struct btrfs_fs_info *fs_info)

diff --git a/fs/btrfs/extent-io-tree.c b/fs/btrfs/extent-io-tree.c
index bb2ca1c9c7b026d7e1f4240b12b312f4f3ba5655..d0dd50f7d2795fe4601f03b2a07ba4e988ecc791 100644 (file)
--- a/fs/btrfs/extent-io-tree.c
+++ b/fs/btrfs/extent-io-tree.c
@@ -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)

diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index 04a266bb189b008e9cfeef8447b48b8cebe75c07..3b840a4fdf1c0d5126c7a2e2f1a51a7ee409f4bf 100644 (file)
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -2559,7 +2559,6 @@ static u64 get_alloc_profile_by_root(struct btrfs_root *root, int data)
 {
        struct btrfs_fs_info *fs_info = root->fs_info;
        u64 flags;
-       u64 ret;
 
        if (data)
                flags = BTRFS_BLOCK_GROUP_DATA;
@@ -2568,8 +2567,7 @@ static u64 get_alloc_profile_by_root(struct btrfs_root *root, int data)
        else
                flags = BTRFS_BLOCK_GROUP_METADATA;
 
-       ret = btrfs_get_alloc_profile(fs_info, flags);
-       return ret;
+       return btrfs_get_alloc_profile(fs_info, flags);
 }
 
 static u64 first_logical_byte(struct btrfs_fs_info *fs_info)
@@ -4191,10 +4189,8 @@ static int find_free_extent_update_loop(struct btrfs_fs_info *fs_info,
                        else
                                trans = btrfs_join_transaction(root);
 
-                       if (IS_ERR(trans)) {
-                               ret = PTR_ERR(trans);
-                               return ret;
-                       }
+                       if (IS_ERR(trans))
+                               return PTR_ERR(trans);
 
                        ret = btrfs_chunk_alloc(trans, space_info, ffe_ctl->flags,
                                                CHUNK_ALLOC_FORCE_FOR_EXTENT);

diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c
index 87425a2430402fa9ff28e0761494467947d3f67a..69edf5f44bda0eb2333625a0e89ba3baf88d0680 100644 (file)
--- a/fs/btrfs/file.c
+++ b/fs/btrfs/file.c
@@ -1272,8 +1272,7 @@ again:
                btrfs_delalloc_release_extents(inode, reserved_len);
                release_space(inode, *data_reserved, reserved_start, reserved_len,
                              only_release_metadata);
-               ret = extents_locked;
-               return ret;
+               return extents_locked;
        }
 
        copied = copy_folio_from_iter_atomic(folio, offset_in_folio(folio, start),

diff --git a/fs/btrfs/free-space-tree.c b/fs/btrfs/free-space-tree.c
index 1ad2ad384b9e8682f3cd6e62daa58429d0f7aca8..a66ce9ef3affb6a9be10f42f69ecbbbd44b938d8 100644 (file)
--- a/fs/btrfs/free-space-tree.c
+++ b/fs/btrfs/free-space-tree.c
@@ -1525,9 +1525,7 @@ int btrfs_remove_block_group_free_space(struct btrfs_trans_handle *trans,
                btrfs_release_path(path);
        }
 
-       ret = 0;
-
-       return ret;
+       return 0;
 }
 
 static int load_free_space_bitmaps(struct btrfs_caching_control *caching_ctl,

diff --git a/fs/btrfs/inode-item.c b/fs/btrfs/inode-item.c
index b73e1dd97208a81cbcf55937b38417e4b75b2c77..a864f8c9972964207bf075f05864d17033c7f2fb 100644 (file)
--- a/fs/btrfs/inode-item.c
+++ b/fs/btrfs/inode-item.c
@@ -371,14 +371,13 @@ int btrfs_insert_empty_inode(struct btrfs_trans_handle *trans,
                             struct btrfs_path *path, u64 objectid)
 {
        struct btrfs_key key;
-       int ret;
+
        key.objectid = objectid;
        key.type = BTRFS_INODE_ITEM_KEY;
        key.offset = 0;
 
-       ret = btrfs_insert_empty_item(trans, root, path, &key,
-                                     sizeof(struct btrfs_inode_item));
-       return ret;
+       return btrfs_insert_empty_item(trans, root, path, &key,
+                                      sizeof(struct btrfs_inode_item));
 }
 
 int btrfs_lookup_inode(struct btrfs_trans_handle *trans, struct btrfs_root

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 912343fc9a731c5db2589a750d8abd4ef6a2d016..cd3baeadda5c414a30b9781cb83b8bd3da89bb8e 100644 (file)
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -2372,7 +2372,6 @@ int btrfs_run_delalloc_range(struct btrfs_inode *inode, struct folio *locked_fol
                             u64 start, u64 end, struct writeback_control *wbc)
 {
        const bool zoned = btrfs_is_zoned(inode->root->fs_info);
-       int ret;
 
        /*
         * The range must cover part of the @locked_folio, or a return of 1
@@ -2381,10 +2380,8 @@ int btrfs_run_delalloc_range(struct btrfs_inode *inode, struct folio *locked_fol
        ASSERT(!(end <= folio_pos(locked_folio) ||
                 start >= folio_next_pos(locked_folio)));
 
-       if (should_nocow(inode, start, end)) {
-               ret = run_delalloc_nocow(inode, locked_folio, start, end);
-               return ret;
-       }
+       if (should_nocow(inode, start, end))
+               return run_delalloc_nocow(inode, locked_folio, start, end);
 
        if (btrfs_inode_can_compress(inode) &&
            inode_need_compress(inode, start, end) &&
@@ -2392,11 +2389,9 @@ int btrfs_run_delalloc_range(struct btrfs_inode *inode, struct folio *locked_fol
                return 1;
 
        if (zoned)
-               ret = run_delalloc_cow(inode, locked_folio, start, end, wbc,
-                                      true);
+               return run_delalloc_cow(inode, locked_folio, start, end, wbc, true);
        else
-               ret = cow_file_range(inode, locked_folio, start, end, NULL, 0);
-       return ret;
+               return cow_file_range(inode, locked_folio, start, end, NULL, 0);
 }
 
 void btrfs_split_delalloc_extent(struct btrfs_inode *inode,

diff --git a/fs/btrfs/qgroup.c b/fs/btrfs/qgroup.c
index ae4a1b76646c5ccfec0f41635017482be1f304c8..14d393a5853d4675cd4f9a8a93416dd65b839a2c 100644 (file)
--- a/fs/btrfs/qgroup.c
+++ b/fs/btrfs/qgroup.c
@@ -694,7 +694,6 @@ void btrfs_free_qgroup_config(struct btrfs_fs_info *fs_info)
 static int add_qgroup_relation_item(struct btrfs_trans_handle *trans, u64 src,
                                    u64 dst)
 {
-       int ret;
        struct btrfs_root *quota_root = trans->fs_info->quota_root;
        BTRFS_PATH_AUTO_FREE(path);
        struct btrfs_key key;
@@ -707,8 +706,7 @@ static int add_qgroup_relation_item(struct btrfs_trans_handle *trans, u64 src,
        key.type = BTRFS_QGROUP_RELATION_KEY;
        key.offset = dst;
 
-       ret = btrfs_insert_empty_item(trans, quota_root, path, &key, 0);
-       return ret;
+       return btrfs_insert_empty_item(trans, quota_root, path, &key, 0);
 }
 
 static int del_qgroup_relation_item(struct btrfs_trans_handle *trans, u64 src,
@@ -833,9 +831,7 @@ static int del_qgroup_item(struct btrfs_trans_handle *trans, u64 qgroupid)
        if (ret > 0)
                return -ENOENT;
 
-       ret = btrfs_del_item(trans, quota_root, path);
-
-       return ret;
+       return btrfs_del_item(trans, quota_root, path);
 }
 
 static int update_qgroup_limit_item(struct btrfs_trans_handle *trans,
@@ -2655,10 +2651,8 @@ int btrfs_qgroup_trace_subtree(struct btrfs_trans_handle *trans,
                        return ret;
        }
 
-       if (root_level == 0) {
-               ret = btrfs_qgroup_trace_leaf_items(trans, root_eb);
-               return ret;
-       }
+       if (root_level == 0)
+               return btrfs_qgroup_trace_leaf_items(trans, root_eb);
 
        path = btrfs_alloc_path();
        if (!path)

diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c
index 5bfefc3e9c06168770d35d56fa59cbb90d67a3e6..310b7d817a277a86532fd594c8a6e5845bb763a5 100644 (file)
--- a/fs/btrfs/relocation.c
+++ b/fs/btrfs/relocation.c
@@ -3254,7 +3254,6 @@ static int delete_v1_space_cache(struct extent_buffer *leaf,
        struct btrfs_key key;
        bool found = false;
        int i;
-       int ret;
 
        if (btrfs_header_owner(leaf) != BTRFS_ROOT_TREE_OBJECTID)
                return 0;
@@ -3278,8 +3277,8 @@ static int delete_v1_space_cache(struct extent_buffer *leaf,
        }
        if (!found)
                return -ENOENT;
-       ret = delete_block_group_cache(block_group, NULL, space_cache_ino);
-       return ret;
+
+       return delete_block_group_cache(block_group, NULL, space_cache_ino);
 }
 
 /*

diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index 8a08412f3529a117775d3208c574509a7d1d97dd..9e52a6f8f7af7996d6e995ddee3f6b37e827080d 100644 (file)
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -2316,9 +2316,7 @@ int btrfs_rm_device(struct btrfs_fs_info *fs_info,
                free_fs_devices(cur_devices);
        }
 
-       ret = btrfs_commit_transaction(trans);
-
-       return ret;
+       return btrfs_commit_transaction(trans);
 
 error_undo:
        if (test_bit(BTRFS_DEV_STATE_WRITEABLE, &device->dev_state)) {
@@ -7167,7 +7165,6 @@ static int read_one_dev(struct extent_buffer *leaf,
        struct btrfs_fs_devices *fs_devices = fs_info->fs_devices;
        struct btrfs_device *device;
        u64 devid;
-       int ret;
        u8 fs_uuid[BTRFS_FSID_SIZE];
        u8 dev_uuid[BTRFS_UUID_SIZE];
 
@@ -7267,8 +7264,8 @@ static int read_one_dev(struct extent_buffer *leaf,
                atomic64_add(device->total_bytes - device->bytes_used,
                                &fs_info->free_chunk_space);
        }
-       ret = 0;
-       return ret;
+
+       return 0;
 }
 
 int btrfs_read_sys_array(struct btrfs_fs_info *fs_info)