Merge tag 'for-6.9-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux

[linux-2.6-microblaze.git] / fs / btrfs / free-space-cache.c

diff --git a/fs/btrfs/free-space-cache.c b/fs/btrfs/free-space-cache.c
index d372c7c..c8a05d5 100644 (file)
--- a/fs/btrfs/free-space-cache.c
+++ b/fs/btrfs/free-space-cache.c
@@ -19,9 +19,7 @@
 #include "transaction.h"
 #include "disk-io.h"
 #include "extent_io.h"
-#include "volumes.h"
 #include "space-info.h"
-#include "delalloc-space.h"
 #include "block-group.h"
 #include "discard.h"
 #include "subpage.h"
@@ -399,7 +397,7 @@ static int io_ctl_init(struct btrfs_io_ctl *io_ctl, struct inode *inode,
                return -ENOMEM;
 
        io_ctl->num_pages = num_pages;
-       io_ctl->fs_info = btrfs_sb(inode->i_sb);
+       io_ctl->fs_info = inode_to_fs_info(inode);
        io_ctl->inode = inode;
 
        return 0;
@@ -2621,7 +2619,7 @@ static void steal_from_bitmap(struct btrfs_free_space_ctl *ctl,
        }
 }
 
-int __btrfs_add_free_space(struct btrfs_block_group *block_group,
+static int __btrfs_add_free_space(struct btrfs_block_group *block_group,
                           u64 offset, u64 bytes,
                           enum btrfs_trim_state trim_state)
 {
@@ -4156,15 +4154,13 @@ out:
 
 int __init btrfs_free_space_init(void)
 {
-       btrfs_free_space_cachep = kmem_cache_create("btrfs_free_space",
-                       sizeof(struct btrfs_free_space), 0,
-                       SLAB_MEM_SPREAD, NULL);
+       btrfs_free_space_cachep = KMEM_CACHE(btrfs_free_space, 0);
        if (!btrfs_free_space_cachep)
                return -ENOMEM;
 
        btrfs_free_space_bitmap_cachep = kmem_cache_create("btrfs_free_space_bitmap",
                                                        PAGE_SIZE, PAGE_SIZE,
-                                                       SLAB_MEM_SPREAD, NULL);
+                                                       0, NULL);
        if (!btrfs_free_space_bitmap_cachep) {
                kmem_cache_destroy(btrfs_free_space_cachep);
                return -ENOMEM;