Btrfs: kill free_space pointer from inode structure

Inodes always allocate free space with BTRFS_BLOCK_GROUP_DATA type,
which means every inode has the same BTRFS_I(inode)->free_space pointer.

This shrinks struct btrfs_inode by 4 bytes (or 8 bytes on 64 bits).

Signed-off-by: Li Zefan <lizefan@huawei.com>

1 files changed, 8 insertions, 12 deletions

diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index 7843542484c9..6621ed72f3c3 100644
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -3139,6 +3139,8 @@ static int update_space_info(struct btrfs_fs_info *info, u64 flags,
         init_waitqueue_head(&found->wait);
         *space_info = found;
         list_add_rcu(&found->list, &info->space_info);
+        if (flags & BTRFS_BLOCK_GROUP_DATA)
+                info->data_sinfo = found;
         return 0;
 }
 
@@ -3268,12 +3270,6 @@ u64 btrfs_get_alloc_profile(struct btrfs_root *root, int data)
         return get_alloc_profile(root, flags);
 }
 
-void btrfs_set_inode_space_info(struct btrfs_root *root, struct inode *inode)
-{
-        BTRFS_I(inode)->space_info = __find_space_info(root->fs_info,
-                                                       BTRFS_BLOCK_GROUP_DATA);
-}
-
 /*
  * This will check the space that the inode allocates from to make sure we have
  * enough space for bytes.
@@ -3282,6 +3278,7 @@ int btrfs_check_data_free_space(struct inode *inode, u64 bytes)
 {
         struct btrfs_space_info *data_sinfo;
         struct btrfs_root *root = BTRFS_I(inode)->root;
+        struct btrfs_fs_info *fs_info = root->fs_info;
         u64 used;
         int ret = 0, committed = 0, alloc_chunk = 1;
 
@@ -3294,7 +3291,7 @@ int btrfs_check_data_free_space(struct inode *inode, u64 bytes)
                 committed = 1;
         }
 
-        data_sinfo = BTRFS_I(inode)->space_info;
+        data_sinfo = fs_info->data_sinfo;
         if (!data_sinfo)
                 goto alloc;
 
@@ -3335,10 +3332,9 @@ alloc:
                                         goto commit_trans;
                         }
 
-                        if (!data_sinfo) {
-                                btrfs_set_inode_space_info(root, inode);
-                                data_sinfo = BTRFS_I(inode)->space_info;
-                        }
+                        if (!data_sinfo)
+                                data_sinfo = fs_info->data_sinfo;
+
                         goto again;
                 }
 
@@ -3385,7 +3381,7 @@ void btrfs_free_reserved_data_space(struct inode *inode, u64 bytes)
         /* make sure bytes are sectorsize aligned */
         bytes = (bytes + root->sectorsize - 1) & ~((u64)root->sectorsize - 1);
 
-        data_sinfo = BTRFS_I(inode)->space_info;
+        data_sinfo = root->fs_info->data_sinfo;
         spin_lock(&data_sinfo->lock);
         data_sinfo->bytes_may_use -= bytes;
         trace_btrfs_space_reservation(root->fs_info, "space_info",