Merge tag 'xfs-4.18-merge-10' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux

[platform/kernel/linux-starfive.git] / fs / xfs / xfs_super.c

diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c
index 7c4813a..9d791f1 100644 (file)
--- a/fs/xfs/xfs_super.c
+++ b/fs/xfs/xfs_super.c
@@ -51,7 +51,7 @@
 #include <linux/parser.h>
 
 static const struct super_operations xfs_super_operations;
-struct bio_set *xfs_ioend_bioset;
+struct bio_set xfs_ioend_bioset;
 
 static struct kset *xfs_kset;          /* top-level xfs sysfs dir */
 #ifdef DEBUG
@@ -1860,10 +1860,9 @@ MODULE_ALIAS_FS("xfs");
 STATIC int __init
 xfs_init_zones(void)
 {
-       xfs_ioend_bioset = bioset_create(4 * MAX_BUF_PER_PAGE,
+       if (bioset_init(&xfs_ioend_bioset, 4 * MAX_BUF_PER_PAGE,
                        offsetof(struct xfs_ioend, io_inline_bio),
-                       BIOSET_NEED_BVECS);
-       if (!xfs_ioend_bioset)
+                       BIOSET_NEED_BVECS))
                goto out;
 
        xfs_log_ticket_zone = kmem_zone_init(sizeof(xlog_ticket_t),
@@ -2005,7 +2004,7 @@ xfs_init_zones(void)
  out_destroy_log_ticket_zone:
        kmem_zone_destroy(xfs_log_ticket_zone);
  out_free_ioend_bioset:
-       bioset_free(xfs_ioend_bioset);
+       bioset_exit(&xfs_ioend_bioset);
  out:
        return -ENOMEM;
 }
@@ -2036,7 +2035,7 @@ xfs_destroy_zones(void)
        kmem_zone_destroy(xfs_btree_cur_zone);
        kmem_zone_destroy(xfs_bmap_free_item_zone);
        kmem_zone_destroy(xfs_log_ticket_zone);
-       bioset_free(xfs_ioend_bioset);
+       bioset_exit(&xfs_ioend_bioset);
 }
 
 STATIC int __init