btrfs: get fs_info from trans in btrfs_write_out_cache
authorDavid Sterba <dsterba@suse.com>
Wed, 20 Mar 2019 12:51:56 +0000 (13:51 +0100)
committerDavid Sterba <dsterba@suse.com>
Mon, 29 Apr 2019 17:02:41 +0000 (19:02 +0200)
We can read fs_info from the transaction and can drop it from the
parameters.

Signed-off-by: David Sterba <dsterba@suse.com>
fs/btrfs/extent-tree.c
fs/btrfs/free-space-cache.c
fs/btrfs/free-space-cache.h

index 931f7d92136395c3a1ce63a16673a9048b8b5ac2..7b65d5349b91ba2fa67b2469e154a6f068ff1199 100644 (file)
@@ -3644,8 +3644,7 @@ again:
 
                if (cache->disk_cache_state == BTRFS_DC_SETUP) {
                        cache->io_ctl.inode = NULL;
 
                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;
                        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;
 
                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;
                        if (ret == 0 && cache->io_ctl.inode) {
                                num_started++;
                                should_put = 0;
index dc1151aebf3d168a6146b17d85dcda0485d08676..c3120df95c8acf67a8f652ccf858fedd573dbfca 100644 (file)
@@ -1369,11 +1369,11 @@ out_unlock:
        goto out;
 }
 
        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_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;
        struct btrfs_free_space_ctl *ctl = block_group->free_space_ctl;
        struct inode *inode;
        int ret = 0;
index 4f0d26ccfde690667c7836061009eed285fafe46..b3a4fce7946ad3eb135ba11dfb6b40dc43c89231 100644 (file)
@@ -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_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,
                          struct btrfs_block_group_cache *block_group,
                          struct btrfs_path *path);
 struct inode *lookup_free_ino_inode(struct btrfs_root *root,