@@ -663,8 +663,7 @@ int btrfs_truncate_inode_items(struct btrfs_trans_handle *trans,
}
should_throttle = false;
- if (del_item && extent_start != 0 &&
- root->root_key.objectid != BTRFS_TREE_LOG_OBJECTID) {
+ if (del_item && extent_start != 0 && !control->skip_ref_updates) {
struct btrfs_ref ref = { 0 };
bytes_deleted += extent_num_bytes;
@@ -27,6 +27,12 @@ struct btrfs_truncate_control {
* removed only if their offset >= new_size.
*/
u32 min_type;
+
+ /*
+ * IN: true if we don't want to do extent reference updates for any file
+ * extents we drop.
+ */
+ bool skip_ref_updates;
};
int btrfs_truncate_inode_items(struct btrfs_trans_handle *trans,
@@ -4098,6 +4098,7 @@ static int truncate_inode_items(struct btrfs_trans_handle *trans,
struct btrfs_truncate_control control = {
.new_size = new_size,
.min_type = min_type,
+ .skip_ref_updates = true,
};
int ret;
We've had weird bugs in the past where we forgot to adjust the truncate path to deal with the fact that we can be called by the tree log path. Instead of checking if our root is a LOG_ROOT use a flag on the btrfs_truncate_control to indicate that we don't want to do extent reference updates during this truncate. Signed-off-by: Josef Bacik <josef@toxicpanda.com> --- fs/btrfs/inode-item.c | 3 +-- fs/btrfs/inode-item.h | 6 ++++++ fs/btrfs/tree-log.c | 1 + 3 files changed, 8 insertions(+), 2 deletions(-)