Commit efb0645b authored by Josef Bacik's avatar Josef Bacik Committed by David Sterba
Browse files

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: default avatarJosef Bacik <josef@toxicpanda.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent bd015294

fs/btrfs/disk-io.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

fs/btrfs/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

fs/btrfs/transaction.c

+1 −1
Original line number Diff line number Diff line
@@ -365,7 +365,7 @@ static noinline int join_transaction(struct btrfs_fs_info *fs_info, 
	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++;