blob: 356bb528bf3298eb298b13e43429fe8702d419f6 [file] [log] [blame]
From f8852defdcae14ab6f18adeabfe2f1ef3300e0d8 Mon Sep 17 00:00:00 2001
From: Josef Bacik <>
Date: Thu, 13 Feb 2020 10:47:29 -0500
Subject: [PATCH] btrfs: do not check delayed items are empty for single
transaction cleanup
commit 1e90315149f3fe148e114a5de86f0196d1c21fa5 upstream.
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: # 4.4+
Reviewed-by: Johannes Thumshirn <>
Reviewed-by: Nikolay Borisov <>
Reviewed-by: Qu Wenruo <>
Signed-off-by: Josef Bacik <>
Reviewed-by: David Sterba <>
Signed-off-by: David Sterba <>
Signed-off-by: Paul Gortmaker <>
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index fd3dd9f7ad7c..b9feeab4bed1 100644
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -4507,7 +4507,6 @@ void btrfs_cleanup_one_transaction(struct btrfs_transaction *cur_trans,
- btrfs_assert_delayed_root_empty(fs_info);
btrfs_destroy_marked_extents(fs_info, &cur_trans->dirty_pages,