btrfs: don't init io tree with private data for non-inodes

We only use this for normal inodes, so don't set it if we're not a
normal inode.

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/disk-io.c b/fs/btrfs/disk-io.c
index 8a3e5b1725b0ae39e4041c89f7531c4a4d059e37..a887fe67a2a08b0821ebe891a9fbff00785cc263 100644 (file)
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -2231,7 +2231,7 @@ static void btrfs_init_btree_inode(struct btrfs_fs_info *fs_info)
 
        RB_CLEAR_NODE(&BTRFS_I(inode)->rb_node);
        extent_io_tree_init(fs_info, &BTRFS_I(inode)->io_tree,
-                           IO_TREE_BTREE_INODE_IO, inode);
+                           IO_TREE_BTREE_INODE_IO, NULL);
        extent_map_tree_init(&BTRFS_I(inode)->extent_tree);
 
        BTRFS_I(inode)->root = btrfs_grab_root(fs_info->tree_root);

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 39f00b68b3a849a50f363fbcf1230d41679c9e15..6fde13f62c1d833a19b7db4afed0065801ee98a5 100644 (file)
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -8800,7 +8800,7 @@ struct inode *btrfs_alloc_inode(struct super_block *sb)
        extent_map_tree_init(&ei->extent_tree);
        extent_io_tree_init(fs_info, &ei->io_tree, IO_TREE_INODE_IO, inode);
        extent_io_tree_init(fs_info, &ei->file_extent_tree,
-                           IO_TREE_INODE_FILE_EXTENT, inode);
+                           IO_TREE_INODE_FILE_EXTENT, NULL);
        ei->io_failure_tree = RB_ROOT;
        atomic_set(&ei->sync_writers, 0);
        mutex_init(&ei->log_mutex);

diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c
index d9d770a9b1a382fd5276779b55de7a8e9f526234..d1f1da6820fb0d51ee8deb349ffb42a3e57e59fe 100644 (file)
--- a/fs/btrfs/transaction.c
+++ b/fs/btrfs/transaction.c
@@ -365,7 +365,7 @@ loop:
        spin_lock_init(&cur_trans->releasing_ebs_lock);
        list_add_tail(&cur_trans->list, &fs_info->trans_list);
        extent_io_tree_init(fs_info, &cur_trans->dirty_pages,
-                       IO_TREE_TRANS_DIRTY_PAGES, fs_info->btree_inode);
+                       IO_TREE_TRANS_DIRTY_PAGES, NULL);
        extent_io_tree_init(fs_info, &cur_trans->pinned_extents,
                        IO_TREE_FS_PINNED_EXTENTS, NULL);
        fs_info->generation++;