Skip to content

Commit 9ac774f

Browse files
kdavekdave
committed
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>
1 parent 3731c3c commit 9ac774f

File tree

13 files changed

+32
-63
lines changed

13 files changed

+32
-63
lines changed

‎fs/btrfs/block-group.c‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1057,8 +1057,7 @@ static int remove_block_group_item(struct btrfs_trans_handle *trans,
10571057
if (ret < 0)
10581058
return ret;
10591059

1060-
ret = btrfs_del_item(trans, root, path);
1061-
return ret;
1060+
return btrfs_del_item(trans, root, path);
10621061
}
10631062

10641063
int btrfs_remove_block_group(struct btrfs_trans_handle *trans,

‎fs/btrfs/ctree.c‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4002,8 +4002,7 @@ int btrfs_split_item(struct btrfs_trans_handle *trans,
40024002
if (ret)
40034003
return ret;
40044004

4005-
ret = split_item(trans, path, new_key, split_offset);
4006-
return ret;
4005+
return split_item(trans, path, new_key, split_offset);
40074006
}
40084007

40094008
/*

‎fs/btrfs/delayed-inode.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1135,8 +1135,8 @@ __btrfs_commit_inode_delayed_items(struct btrfs_trans_handle *trans,
11351135
ret = btrfs_record_root_in_trans(trans, node->root);
11361136
if (ret)
11371137
return ret;
1138-
ret = btrfs_update_delayed_inode(trans, node->root, path, node);
1139-
return ret;
1138+
1139+
return btrfs_update_delayed_inode(trans, node->root, path, node);
11401140
}
11411141

11421142
/*

‎fs/btrfs/disk-io.c‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,6 @@ static int btrfs_repair_eb_io_failure(const struct extent_buffer *eb,
175175
const u32 step = min(fs_info->nodesize, PAGE_SIZE);
176176
const u32 nr_steps = eb->len / step;
177177
phys_addr_t paddrs[BTRFS_MAX_BLOCKSIZE / PAGE_SIZE];
178-
int ret = 0;
179178

180179
if (sb_rdonly(fs_info->sb))
181180
return -EROFS;
@@ -197,9 +196,8 @@ static int btrfs_repair_eb_io_failure(const struct extent_buffer *eb,
197196
paddrs[i] = page_to_phys(&folio->page) + offset_in_page(eb->start);
198197
}
199198

200-
ret = btrfs_repair_io_failure(fs_info, 0, eb->start, eb->len, eb->start,
201-
paddrs, step, mirror_num);
202-
return ret;
199+
return btrfs_repair_io_failure(fs_info, 0, eb->start, eb->len,
200+
eb->start, paddrs, step, mirror_num);
203201
}
204202

205203
/*
@@ -2167,11 +2165,10 @@ static int load_global_roots(struct btrfs_root *tree_root)
21672165
return ret;
21682166
if (!btrfs_fs_compat_ro(tree_root->fs_info, FREE_SPACE_TREE))
21692167
return ret;
2170-
ret = load_global_roots_objectid(tree_root, path,
2171-
BTRFS_FREE_SPACE_TREE_OBJECTID,
2172-
"free space");
21732168

2174-
return ret;
2169+
return load_global_roots_objectid(tree_root, path,
2170+
BTRFS_FREE_SPACE_TREE_OBJECTID,
2171+
"free space");
21752172
}
21762173

21772174
static int btrfs_read_roots(struct btrfs_fs_info *fs_info)

‎fs/btrfs/extent-io-tree.c‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -187,18 +187,15 @@ static int add_extent_changeset(struct extent_state *state, u32 bits,
187187
struct extent_changeset *changeset,
188188
int set)
189189
{
190-
int ret;
191-
192190
if (!changeset)
193191
return 0;
194192
if (set && (state->state & bits) == bits)
195193
return 0;
196194
if (!set && (state->state & bits) == 0)
197195
return 0;
198196
changeset->bytes_changed += state->end - state->start + 1;
199-
ret = ulist_add(&changeset->range_changed, state->start, state->end,
200-
GFP_ATOMIC);
201-
return ret;
197+
198+
return ulist_add(&changeset->range_changed, state->start, state->end, GFP_ATOMIC);
202199
}
203200

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

‎fs/btrfs/extent-tree.c‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2559,7 +2559,6 @@ static u64 get_alloc_profile_by_root(struct btrfs_root *root, int data)
25592559
{
25602560
struct btrfs_fs_info *fs_info = root->fs_info;
25612561
u64 flags;
2562-
u64 ret;
25632562

25642563
if (data)
25652564
flags = BTRFS_BLOCK_GROUP_DATA;
@@ -2568,8 +2567,7 @@ static u64 get_alloc_profile_by_root(struct btrfs_root *root, int data)
25682567
else
25692568
flags = BTRFS_BLOCK_GROUP_METADATA;
25702569

2571-
ret = btrfs_get_alloc_profile(fs_info, flags);
2572-
return ret;
2570+
return btrfs_get_alloc_profile(fs_info, flags);
25732571
}
25742572

25752573
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,
41914189
else
41924190
trans = btrfs_join_transaction(root);
41934191

4194-
if (IS_ERR(trans)) {
4195-
ret = PTR_ERR(trans);
4196-
return ret;
4197-
}
4192+
if (IS_ERR(trans))
4193+
return PTR_ERR(trans);
41984194

41994195
ret = btrfs_chunk_alloc(trans, space_info, ffe_ctl->flags,
42004196
CHUNK_ALLOC_FORCE_FOR_EXTENT);

‎fs/btrfs/file.c‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1272,8 +1272,7 @@ static int copy_one_range(struct btrfs_inode *inode, struct iov_iter *iter,
12721272
btrfs_delalloc_release_extents(inode, reserved_len);
12731273
release_space(inode, *data_reserved, reserved_start, reserved_len,
12741274
only_release_metadata);
1275-
ret = extents_locked;
1276-
return ret;
1275+
return extents_locked;
12771276
}
12781277

12791278
copied = copy_folio_from_iter_atomic(folio, offset_in_folio(folio, start),

‎fs/btrfs/free-space-tree.c‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1525,9 +1525,7 @@ int btrfs_remove_block_group_free_space(struct btrfs_trans_handle *trans,
15251525
btrfs_release_path(path);
15261526
}
15271527

1528-
ret = 0;
1529-
1530-
return ret;
1528+
return 0;
15311529
}
15321530

15331531
static int load_free_space_bitmaps(struct btrfs_caching_control *caching_ctl,

‎fs/btrfs/inode-item.c‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -371,14 +371,13 @@ int btrfs_insert_empty_inode(struct btrfs_trans_handle *trans,
371371
struct btrfs_path *path, u64 objectid)
372372
{
373373
struct btrfs_key key;
374-
int ret;
374+
375375
key.objectid = objectid;
376376
key.type = BTRFS_INODE_ITEM_KEY;
377377
key.offset = 0;
378378

379-
ret = btrfs_insert_empty_item(trans, root, path, &key,
380-
sizeof(struct btrfs_inode_item));
381-
return ret;
379+
return btrfs_insert_empty_item(trans, root, path, &key,
380+
sizeof(struct btrfs_inode_item));
382381
}
383382

384383
int btrfs_lookup_inode(struct btrfs_trans_handle *trans, struct btrfs_root

‎fs/btrfs/inode.c‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2350,7 +2350,6 @@ int btrfs_run_delalloc_range(struct btrfs_inode *inode, struct folio *locked_fol
23502350
u64 start, u64 end, struct writeback_control *wbc)
23512351
{
23522352
const bool zoned = btrfs_is_zoned(inode->root->fs_info);
2353-
int ret;
23542353

23552354
/*
23562355
* The range must cover part of the @locked_folio, or a return of 1
@@ -2359,22 +2358,18 @@ int btrfs_run_delalloc_range(struct btrfs_inode *inode, struct folio *locked_fol
23592358
ASSERT(!(end <= folio_pos(locked_folio) ||
23602359
start >= folio_next_pos(locked_folio)));
23612360

2362-
if (should_nocow(inode, start, end)) {
2363-
ret = run_delalloc_nocow(inode, locked_folio, start, end);
2364-
return ret;
2365-
}
2361+
if (should_nocow(inode, start, end))
2362+
return run_delalloc_nocow(inode, locked_folio, start, end);
23662363

23672364
if (btrfs_inode_can_compress(inode) &&
23682365
inode_need_compress(inode, start, end) &&
23692366
run_delalloc_compressed(inode, locked_folio, start, end, wbc))
23702367
return 1;
23712368

23722369
if (zoned)
2373-
ret = run_delalloc_cow(inode, locked_folio, start, end, wbc,
2374-
true);
2370+
return run_delalloc_cow(inode, locked_folio, start, end, wbc, true);
23752371
else
2376-
ret = cow_file_range(inode, locked_folio, start, end, NULL, 0);
2377-
return ret;
2372+
return cow_file_range(inode, locked_folio, start, end, NULL, 0);
23782373
}
23792374

23802375
void btrfs_split_delalloc_extent(struct btrfs_inode *inode,

0 commit comments

Comments
 (0)