btrfs: remove all extra btrfs_check_eb_owner() calls

Currently we have a handful of btrfs_check_eb_owner() calls in various
places and helpers that read extent buffers.  However we call this in
the endio handler for every metadata block, so these extra checks are
unnecessary, simply remove them from everywhere except the endio
handler.

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>

diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c
index 1a49b92329908eecb574d8c020d8261ff2b4f6ff..48aa14046343a42c0def39ea0e5f973808c981e9 100644 (file)
--- a/fs/btrfs/ctree.c
+++ b/fs/btrfs/ctree.c
@@ -1551,12 +1551,7 @@ read_block_for_search(struct btrfs_root *root, struct btrfs_path *p,
                if (ret) {
                        free_extent_buffer(tmp);
                        btrfs_release_path(p);
-                       return -EIO;
-               }
-               if (btrfs_check_eb_owner(tmp, btrfs_root_id(root))) {
-                       free_extent_buffer(tmp);
-                       btrfs_release_path(p);
-                       return -EUCLEAN;
+                       return ret;
                }
 
                if (unlock_up)

diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index ffc9129e23d2632882552b00785af6fe6a8811ef..5870e76d20e2668daaae5cdfa90620a75b89a3bb 100644 (file)
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -635,10 +635,6 @@ struct extent_buffer *read_tree_block(struct btrfs_fs_info *fs_info, u64 bytenr,
                free_extent_buffer_stale(buf);
                return ERR_PTR(ret);
        }
-       if (btrfs_check_eb_owner(buf, check->owner_root)) {
-               free_extent_buffer_stale(buf);
-               return ERR_PTR(-EUCLEAN);
-       }
        return buf;
 
 }