[PATCH 31/31] btrfs: remove is_data_inode() checks in extent-io-tree.c

Josef Bacik
2022-09-02T20:17:41Z

We're only init'ing extent_io_tree's with a private data if we're a
normal inode, so we don't need this extra check.

Signed-off-by: Josef Bacik <josef@toxicpanda.com>
---
fs/btrfs/extent-io-tree.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/fs/btrfs/extent-io-tree.c b/fs/btrfs/extent-io-tree.c
index f37de54056e8..c67370469548 100644
--- a/fs/btrfs/extent-io-tree.c
+++ b/fs/btrfs/extent-io-tree.c
@@ -59,7 +59,7 @@ static inline void __btrfs_debug_check_extent_io_range(const char *caller,
struct inode *inode = tree->private_data;
u64 isize;

- if (!inode || !is_data_inode(inode))
+ if (!inode)
return;

isize = i_size_read(inode);
@@ -332,7 +332,7 @@ static void merge_state(struct extent_io_tree *tree,
other = prev_state(state);
if (other && other->end == state->start - 1 &&
other->state == state->state) {
- if (tree->private_data && is_data_inode(tree->private_data))
+ if (tree->private_data)
btrfs_merge_delalloc_extent(tree->private_data,
state, other);
state->start = other->start;
@@ -343,7 +343,7 @@ static void merge_state(struct extent_io_tree *tree,
other = next_state(state);
if (other && other->start == state->end + 1 &&
other->state == state->state) {
- if (tree->private_data && is_data_inode(tree->private_data))
+ if (tree->private_data)
btrfs_merge_delalloc_extent(tree->private_data, state,
other);
state->end = other->end;
@@ -437,7 +437,7 @@ static int split_state(struct extent_io_tree *tree, struct extent_state *orig,
struct rb_node *parent = NULL;
struct rb_node **node;

- if (tree->private_data && is_data_inode(tree->private_data))
+ if (tree->private_data)
btrfs_split_delalloc_extent(tree->private_data, orig, split);

prealloc->start = orig->start;
@@ -485,7 +485,7 @@ static struct extent_state *clear_state_bit(struct extent_io_tree *tree,
u32 bits_to_clear = bits & ~EXTENT_CTLBITS;
int ret;

- if (tree->private_data && is_data_inode(tree->private_data))
+ if (tree->private_data)
btrfs_clear_delalloc_extent(tree->private_data, state, bits);

ret = add_extent_changeset(state, bits_to_clear, changeset, 0);
@@ -747,7 +747,7 @@ static void set_state_bits(struct extent_io_tree *tree,
u32 bits_to_set = bits & ~EXTENT_CTLBITS;
int ret;

- if (tree->private_data && is_data_inode(tree->private_data))
+ if (tree->private_data)
btrfs_set_delalloc_extent(tree->private_data, state, bits);

ret = add_extent_changeset(state, bits_to_set, changeset, 1);
--
2.26.3