1 files changed, 15 insertions, 5 deletions

diff --git a/fs/configfs/mount.c b/fs/configfs/mount.c
index cfd91320e869..13c93715864b 100644
--- a/fs/configfs/mount.c
+++ b/fs/configfs/mount.c
@@ -27,6 +27,7 @@
 #include <linux/fs.h>
 #include <linux/module.h>
 #include <linux/mount.h>
+#include <linux/fs_context.h>
 #include <linux/pagemap.h>
 #include <linux/init.h>
 #include <linux/slab.h>
@@ -66,7 +67,7 @@ static struct configfs_dirent configfs_root = {
         .s_iattr        = NULL,
 };
 
-static int configfs_fill_super(struct super_block *sb, void *data, int silent)
+static int configfs_fill_super(struct super_block *sb, struct fs_context *fc)
 {
         struct inode *inode;
         struct dentry *root;
@@ -102,16 +103,25 @@ static int configfs_fill_super(struct super_block *sb, void *data, int silent)
         return 0;
 }
 
-static struct dentry *configfs_do_mount(struct file_system_type *fs_type,
-        int flags, const char *dev_name, void *data)
+static int configfs_get_tree(struct fs_context *fc)
 {
-        return mount_single(fs_type, flags, data, configfs_fill_super);
+        return get_tree_single(fc, configfs_fill_super);
+}
+
+static const struct fs_context_operations configfs_context_ops = {
+        .get_tree       = configfs_get_tree,
+};
+
+static int configfs_init_fs_context(struct fs_context *fc)
+{
+        fc->ops = &configfs_context_ops;
+        return 0;
 }
 
 static struct file_system_type configfs_fs_type = {
         .owner          = THIS_MODULE,
         .name           = "configfs",
-        .mount          = configfs_do_mount,
+        .init_fs_context = configfs_init_fs_context,
         .kill_sb        = kill_litter_super,
 };
 MODULE_ALIAS_FS("configfs");