Free space inode data was only read when loading the v1 cache, which is
gone, so btrfs_get_extent() and btrfs_lookup_bio_sums() no longer need
to search the commit root for them.
Assisted-by: Claude:claude-fable-5-1
Signed-off-by: Tal Zussman <redacted>
---
fs/btrfs/file-item.c | 11 -----------
fs/btrfs/inode.c | 10 ----------
2 files changed, 21 deletions(-)
diff --git a/fs/btrfs/file-item.c b/fs/btrfs/file-item.c
index cf50fd623f41..484c04de1af5 100644
--- a/fs/btrfs/file-item.c
+++ b/fs/btrfs/file-item.c
@@ -396,17 +396,6 @@ int btrfs_lookup_bio_sums(struct btrfs_bio *bbio)
if (nblocks > fs_info->csums_per_leaf)
path->reada = READA_FORWARD;
- /*
- * the free space stuff is only read when it hasn't been
- * updated in the current transaction. So, we can safely
- * read from the commit root and sidestep a nasty deadlock
- * between reading the free space cache and updating the csum tree.
- */
- if (btrfs_is_free_space_inode(inode)) {
- path->search_commit_root = true;
- path->skip_locking = true;
- }
-
/*
* If we are searching for a csum of an extent from a past
* transaction, we can search in the commit root and reducediff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 89b50d4e0400..163f26fe36e7 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -7230,16 +7230,6 @@ struct extent_map *btrfs_get_extent(struct btrfs_inode *inode,
/* Chances are we'll be called again, so go ahead and do readahead */
path->reada = READA_FORWARD;
- /*
- * The same explanation in load_free_space_cache applies here as well,
- * we only read when we're loading the free space cache, and at that
- * point the commit_root has everything we need.
- */
- if (btrfs_is_free_space_inode(inode)) {
- path->search_commit_root = true;
- path->skip_locking = true;
- }
-
ret = btrfs_lookup_file_extent(NULL, root, path, objectid, start, 0);
if (ret < 0) {
goto out;
--
2.39.5