Skip to content

Commit 1e8a423

Browse files
asjkdave
authored andcommitted
btrfs: rename werr and err to ret in __btrfs_wait_marked_extents()
Rename the function's local return variables err and werr to ret. Also, align the variable declarations with the other declarations in the function for better function space alignment. Signed-off-by: Anand Jain <[email protected]> Reviewed-by: David Sterba <[email protected]> Signed-off-by: David Sterba <[email protected]>
1 parent ce87531 commit 1e8a423

File tree

1 file changed

+8
-13
lines changed

1 file changed

+8
-13
lines changed

fs/btrfs/transaction.c

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1171,12 +1171,11 @@ int btrfs_write_marked_extents(struct btrfs_fs_info *fs_info,
11711171
static int __btrfs_wait_marked_extents(struct btrfs_fs_info *fs_info,
11721172
struct extent_io_tree *dirty_pages)
11731173
{
1174-
int err = 0;
1175-
int werr = 0;
11761174
struct address_space *mapping = fs_info->btree_inode->i_mapping;
11771175
struct extent_state *cached_state = NULL;
11781176
u64 start = 0;
11791177
u64 end;
1178+
int ret = 0;
11801179

11811180
while (find_first_extent_bit(dirty_pages, start, &start, &end,
11821181
EXTENT_NEED_WAIT, &cached_state)) {
@@ -1188,24 +1187,20 @@ static int __btrfs_wait_marked_extents(struct btrfs_fs_info *fs_info,
11881187
* concurrently - we do it only at transaction commit time when
11891188
* it's safe to do it (through extent_io_tree_release()).
11901189
*/
1191-
err = clear_extent_bit(dirty_pages, start, end,
1190+
ret = clear_extent_bit(dirty_pages, start, end,
11921191
EXTENT_NEED_WAIT, &cached_state);
1193-
if (err == -ENOMEM)
1194-
err = 0;
1195-
if (!err)
1196-
err = filemap_fdatawait_range(mapping, start, end);
1197-
if (err)
1198-
werr = err;
1192+
if (ret == -ENOMEM)
1193+
ret = 0;
1194+
if (!ret)
1195+
ret = filemap_fdatawait_range(mapping, start, end);
11991196
free_extent_state(cached_state);
1200-
if (werr)
1197+
if (ret)
12011198
break;
12021199
cached_state = NULL;
12031200
cond_resched();
12041201
start = end + 1;
12051202
}
1206-
if (err)
1207-
werr = err;
1208-
return werr;
1203+
return ret;
12091204
}
12101205

12111206
static int btrfs_wait_extents(struct btrfs_fs_info *fs_info,

0 commit comments

Comments
 (0)