From: Josef Bacik Date: Fri, 9 Sep 2022 21:53:48 +0000 (-0400) Subject: btrfs: don't init io tree with private data for non-inodes X-Git-Tag: v6.1-rc5~25^2~78 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=efb0645bd9dfd1cbfaab766444de4748556dc103;p=platform%2Fkernel%2Flinux-starfive.git 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 Reviewed-by: David Sterba Signed-off-by: David Sterba --- diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index 8a3e5b1..a887fe6 100644 --- 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 39f00b6..6fde13f 100644 --- 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 d9d770a..d1f1da6 100644 --- 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++;