@@ -1118,8 +1118,7 @@ int btrfs_end_transaction_throttle(struct btrfs_trans_handle *trans)
1118
1118
int btrfs_write_marked_extents (struct btrfs_fs_info * fs_info ,
1119
1119
struct extent_io_tree * dirty_pages , int mark )
1120
1120
{
1121
- int err = 0 ;
1122
- int werr = 0 ;
1121
+ int ret = 0 ;
1123
1122
struct address_space * mapping = fs_info -> btree_inode -> i_mapping ;
1124
1123
struct extent_state * cached_state = NULL ;
1125
1124
u64 start = 0 ;
@@ -1129,7 +1128,7 @@ int btrfs_write_marked_extents(struct btrfs_fs_info *fs_info,
1129
1128
mark , & cached_state )) {
1130
1129
bool wait_writeback = false;
1131
1130
1132
- err = convert_extent_bit (dirty_pages , start , end ,
1131
+ ret = convert_extent_bit (dirty_pages , start , end ,
1133
1132
EXTENT_NEED_WAIT ,
1134
1133
mark , & cached_state );
1135
1134
/*
@@ -1145,24 +1144,22 @@ int btrfs_write_marked_extents(struct btrfs_fs_info *fs_info,
1145
1144
* We cleanup any entries left in the io tree when committing
1146
1145
* the transaction (through extent_io_tree_release()).
1147
1146
*/
1148
- if (err == - ENOMEM ) {
1149
- err = 0 ;
1147
+ if (ret == - ENOMEM ) {
1148
+ ret = 0 ;
1150
1149
wait_writeback = true;
1151
1150
}
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 );
1158
1155
free_extent_state (cached_state );
1159
- if (werr )
1156
+ if (ret )
1160
1157
break ;
1161
1158
cached_state = NULL ;
1162
1159
cond_resched ();
1163
1160
start = end + 1 ;
1164
1161
}
1165
- return werr ;
1162
+ return ret ;
1166
1163
}
1167
1164
1168
1165
/*
0 commit comments