Skip to content

Commit 1e90315

Browse files
josefbacikkdave
authored andcommitted
btrfs: do not check delayed items are empty for single transaction cleanup
btrfs_assert_delayed_root_empty() will check if the delayed root is completely empty, but this is a filesystem-wide check. On cleanup we may have allowed other transactions to begin, for whatever reason, and thus the delayed root is not empty. So remove this check from cleanup_one_transation(). This however can stay in btrfs_cleanup_transaction(), because it checks only after all of the transactions have been properly cleaned up, and thus is valid. CC: stable@vger.kernel.org # 4.4+ Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com> Reviewed-by: Nikolay Borisov <nborisov@suse.com> Reviewed-by: Qu Wenruo <wqu@suse.com> Signed-off-by: Josef Bacik <josef@toxicpanda.com> Reviewed-by: David Sterba <dsterba@suse.com> Signed-off-by: David Sterba <dsterba@suse.com>
1 parent 315bf8e commit 1e90315

1 file changed

Lines changed: 0 additions & 1 deletion

File tree

fs/btrfs/disk-io.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4503,7 +4503,6 @@ void btrfs_cleanup_one_transaction(struct btrfs_transaction *cur_trans,
45034503
wake_up(&fs_info->transaction_wait);
45044504

45054505
btrfs_destroy_delayed_inodes(fs_info);
4506-
btrfs_assert_delayed_root_empty(fs_info);
45074506

45084507
btrfs_destroy_marked_extents(fs_info, &cur_trans->dirty_pages,
45094508
EXTENT_DIRTY);

0 commit comments

Comments
 (0)