btrfs: don't clear ret in btrfs_start_dirty_block_groups
authorJosef Bacik <josef@toxicpanda.com>
Wed, 16 Dec 2020 16:22:17 +0000 (11:22 -0500)
committerDavid Sterba <dsterba@suse.com>
Mon, 18 Jan 2021 15:00:11 +0000 (16:00 +0100)
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>
fs/btrfs/block-group.c

index 52f2198d44c95c513d942af7a50f6807820cd931..0886e81e554020daf145ba6a0b0044e6aeb5fc54 100644 (file)
@@ -2669,7 +2669,8 @@ again:
         * Go through delayed refs for all the stuff we've just kicked off
         * and then loop back (just once)
         */
-       ret = btrfs_run_delayed_refs(trans, 0);
+       if (!ret)
+               ret = btrfs_run_delayed_refs(trans, 0);
        if (!ret && loops == 0) {
                loops++;
                spin_lock(&cur_trans->dirty_bgs_lock);