diff options
| author | David Sterba <dsterba@suse.com> | 2019-03-20 13:42:57 +0100 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2019-04-29 19:02:41 +0200 |
| commit | 4ca75f1bd413ec0c550f925c009a7ba1b20e6003 (patch) | |
| tree | cdb92a77321e5fcfedeef45fb7dca7a51d92361d | |
| parent | 907877664e2d858b9344e3a46ceeb2e74425e81f (diff) | |
| download | linux-4ca75f1bd413ec0c550f925c009a7ba1b20e6003.tar.bz2 | |
btrfs: get fs_info from trans in create_free_space_inode
We can read fs_info from the transaction and can drop it from the
parameters.
Signed-off-by: David Sterba <dsterba@suse.com>
| -rw-r--r-- | fs/btrfs/extent-tree.c | 3 | ||||
| -rw-r--r-- | fs/btrfs/free-space-cache.c | 9 | ||||
| -rw-r--r-- | fs/btrfs/free-space-cache.h | 3 |
3 files changed, 6 insertions, 9 deletions
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c index 174f4f0311da..931f7d921363 100644 --- a/fs/btrfs/extent-tree.c +++ b/fs/btrfs/extent-tree.c @@ -3411,8 +3411,7 @@ again: if (block_group->ro) goto out_free; - ret = create_free_space_inode(fs_info, trans, block_group, - path); + ret = create_free_space_inode(trans, block_group, path); if (ret) goto out_free; goto again; diff --git a/fs/btrfs/free-space-cache.c b/fs/btrfs/free-space-cache.c index 207fb50dcc7a..dc1151aebf3d 100644 --- a/fs/btrfs/free-space-cache.c +++ b/fs/btrfs/free-space-cache.c @@ -185,20 +185,19 @@ static int __create_free_space_inode(struct btrfs_root *root, return 0; } -int create_free_space_inode(struct btrfs_fs_info *fs_info, - struct btrfs_trans_handle *trans, +int create_free_space_inode(struct btrfs_trans_handle *trans, struct btrfs_block_group_cache *block_group, struct btrfs_path *path) { int ret; u64 ino; - ret = btrfs_find_free_objectid(fs_info->tree_root, &ino); + ret = btrfs_find_free_objectid(trans->fs_info->tree_root, &ino); if (ret < 0) return ret; - return __create_free_space_inode(fs_info->tree_root, trans, path, ino, - block_group->key.objectid); + return __create_free_space_inode(trans->fs_info->tree_root, trans, path, + ino, block_group->key.objectid); } int btrfs_check_trunc_cache_free_space(struct btrfs_fs_info *fs_info, diff --git a/fs/btrfs/free-space-cache.h b/fs/btrfs/free-space-cache.h index 15e30b93db0d..4f0d26ccfde6 100644 --- a/fs/btrfs/free-space-cache.h +++ b/fs/btrfs/free-space-cache.h @@ -41,8 +41,7 @@ struct btrfs_io_ctl; struct inode *lookup_free_space_inode(struct btrfs_fs_info *fs_info, struct btrfs_block_group_cache *block_group, struct btrfs_path *path); -int create_free_space_inode(struct btrfs_fs_info *fs_info, - struct btrfs_trans_handle *trans, +int create_free_space_inode(struct btrfs_trans_handle *trans, struct btrfs_block_group_cache *block_group, struct btrfs_path *path); |