btrfs: get fs_info from trans in btrfs_write_out_cache (fe041534) · Commits · 戴 / test

fs/btrfs/extent-tree.c

+2 −4

Original line number	Diff line number	Diff line
		@@ -3644,8 +3644,7 @@ again:

		if (cache->disk_cache_state == BTRFS_DC_SETUP) {
		cache->io_ctl.inode = NULL;
		ret = btrfs_write_out_cache(fs_info, trans,
		cache, path);
		ret = btrfs_write_out_cache(trans, cache, path);
		if (ret == 0 && cache->io_ctl.inode) {
		num_started++;
		should_put = 0;
		@@ -3800,8 +3799,7 @@ int btrfs_write_dirty_block_groups(struct btrfs_trans_handle *trans)

		if (!ret && cache->disk_cache_state == BTRFS_DC_SETUP) {
		cache->io_ctl.inode = NULL;
		ret = btrfs_write_out_cache(fs_info, trans,
		cache, path);
		ret = btrfs_write_out_cache(trans, cache, path);
		if (ret == 0 && cache->io_ctl.inode) {
		num_started++;
		should_put = 0;

+2 −2

Original line number	Diff line number	Diff line
		@@ -1369,11 +1369,11 @@ out_unlock:
		goto out;
		}

		int btrfs_write_out_cache(struct btrfs_fs_info *fs_info,
		struct btrfs_trans_handle *trans,
		int btrfs_write_out_cache(struct btrfs_trans_handle *trans,
		struct btrfs_block_group_cache *block_group,
		struct btrfs_path *path)
		{
		struct btrfs_fs_info *fs_info = trans->fs_info;
		struct btrfs_free_space_ctl *ctl = block_group->free_space_ctl;
		struct inode *inode;
		int ret = 0;

+1 −2

Original line number	Diff line number	Diff line
		@@ -55,8 +55,7 @@ int load_free_space_cache(struct btrfs_fs_info *fs_info,
		int btrfs_wait_cache_io(struct btrfs_trans_handle *trans,
		struct btrfs_block_group_cache *block_group,
		struct btrfs_path *path);
		int btrfs_write_out_cache(struct btrfs_fs_info *fs_info,
		struct btrfs_trans_handle *trans,
		int btrfs_write_out_cache(struct btrfs_trans_handle *trans,
		struct btrfs_block_group_cache *block_group,
		struct btrfs_path *path);
		struct inode lookup_free_ino_inode(struct btrfs_root root,