Skip to content

Commit 018abb5

Browse files
josefbacikgregkh
authored andcommitted
btrfs: don't clear ret in btrfs_start_dirty_block_groups
commit 34d1eb0 upstream. If we fail to update a block group item in the loop we'll break, however we'll do btrfs_run_delayed_refs and lose our error value in ret, and thus not clean up properly. Fix this by only running the delayed refs if there was no failure. CC: stable@vger.kernel.org # 4.4+ Reviewed-by: Qu Wenruo <wqu@suse.com> Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com> Signed-off-by: Josef Bacik <josef@toxicpanda.com> Reviewed-by: David Sterba <dsterba@suse.com> Signed-off-by: David Sterba <dsterba@suse.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 14e17e9 commit 018abb5

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

fs/btrfs/block-group.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2687,7 +2687,8 @@ int btrfs_start_dirty_block_groups(struct btrfs_trans_handle *trans)
26872687
* Go through delayed refs for all the stuff we've just kicked off
26882688
* and then loop back (just once)
26892689
*/
2690-
ret = btrfs_run_delayed_refs(trans, 0);
2690+
if (!ret)
2691+
ret = btrfs_run_delayed_refs(trans, 0);
26912692
if (!ret && loops == 0) {
26922693
loops++;
26932694
spin_lock(&cur_trans->dirty_bgs_lock);

0 commit comments

Comments
 (0)