]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
Btrfs: clean up resources during umount after trans is aborted
authorLiu Bo <bo.liu@linux.alibaba.com>
Fri, 30 Mar 2018 22:11:56 +0000 (06:11 +0800)
committerDavid Sterba <dsterba@suse.com>
Thu, 12 Apr 2018 12:49:47 +0000 (14:49 +0200)
Currently if some fatal errors occur, like all IO get -EIO, resources
would be cleaned up when
a) transaction is being committed or
b) BTRFS_FS_STATE_ERROR is set

However, in some rare cases, resources may be left alone after transaction
gets aborted and umount may run into some ASSERT(), e.g.
ASSERT(list_empty(&block_group->dirty_list));

For case a), in btrfs_commit_transaciton(), there're several places at the
beginning where we just call btrfs_end_transaction() without cleaning up
resources.  For case b), it is possible that the trans handle doesn't have
any dirty stuff, then only trans hanlde is marked as aborted while
BTRFS_FS_STATE_ERROR is not set, so resources remain in memory.

This makes btrfs also check BTRFS_FS_STATE_TRANS_ABORTED to make sure that
all resources won't stay in memory after umount.

Signed-off-by: Liu Bo <bo.liu@linux.alibaba.com>
Signed-off-by: David Sterba <dsterba@suse.com>
fs/btrfs/disk-io.c

index 07b5e6f7df6711dbcc41419e97f6797d2a4f24d1..bb38f4098e9c903c17614fbe68db0808c753462f 100644 (file)
@@ -3812,7 +3812,8 @@ void close_ctree(struct btrfs_fs_info *fs_info)
                        btrfs_err(fs_info, "commit super ret %d", ret);
        }
 
-       if (test_bit(BTRFS_FS_STATE_ERROR, &fs_info->fs_state))
+       if (test_bit(BTRFS_FS_STATE_ERROR, &fs_info->fs_state) ||
+           test_bit(BTRFS_FS_STATE_TRANS_ABORTED, &fs_info->fs_state))
                btrfs_error_commit_super(fs_info);
 
        kthread_stop(fs_info->transaction_kthread);