Skip to content

Commit ce87531

Browse files
asjkdave
authored andcommitted
btrfs: rename werr and err to ret in btrfs_write_marked_extents()
Rename the function's local variable werr and err to ret. Reviewed-by: Josef Bacik <[email protected]> Signed-off-by: Anand Jain <[email protected]> Reviewed-by: David Sterba <[email protected]> Signed-off-by: David Sterba <[email protected]>
1 parent 9a7b68d commit ce87531

File tree

1 file changed

+10
-13
lines changed

1 file changed

+10
-13
lines changed

fs/btrfs/transaction.c

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1118,8 +1118,7 @@ int btrfs_end_transaction_throttle(struct btrfs_trans_handle *trans)
11181118
int btrfs_write_marked_extents(struct btrfs_fs_info *fs_info,
11191119
struct extent_io_tree *dirty_pages, int mark)
11201120
{
1121-
int err = 0;
1122-
int werr = 0;
1121+
int ret = 0;
11231122
struct address_space *mapping = fs_info->btree_inode->i_mapping;
11241123
struct extent_state *cached_state = NULL;
11251124
u64 start = 0;
@@ -1129,7 +1128,7 @@ int btrfs_write_marked_extents(struct btrfs_fs_info *fs_info,
11291128
mark, &cached_state)) {
11301129
bool wait_writeback = false;
11311130

1132-
err = convert_extent_bit(dirty_pages, start, end,
1131+
ret = convert_extent_bit(dirty_pages, start, end,
11331132
EXTENT_NEED_WAIT,
11341133
mark, &cached_state);
11351134
/*
@@ -1145,24 +1144,22 @@ int btrfs_write_marked_extents(struct btrfs_fs_info *fs_info,
11451144
* We cleanup any entries left in the io tree when committing
11461145
* the transaction (through extent_io_tree_release()).
11471146
*/
1148-
if (err == -ENOMEM) {
1149-
err = 0;
1147+
if (ret == -ENOMEM) {
1148+
ret = 0;
11501149
wait_writeback = true;
11511150
}
1152-
if (!err)
1153-
err = filemap_fdatawrite_range(mapping, start, end);
1154-
if (err)
1155-
werr = err;
1156-
else if (wait_writeback)
1157-
werr = filemap_fdatawait_range(mapping, start, end);
1151+
if (!ret)
1152+
ret = filemap_fdatawrite_range(mapping, start, end);
1153+
if (!ret && wait_writeback)
1154+
ret = filemap_fdatawait_range(mapping, start, end);
11581155
free_extent_state(cached_state);
1159-
if (werr)
1156+
if (ret)
11601157
break;
11611158
cached_state = NULL;
11621159
cond_resched();
11631160
start = end + 1;
11641161
}
1165-
return werr;
1162+
return ret;
11661163
}
11671164

11681165
/*

0 commit comments

Comments
 (0)