Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6-microblaze.git] / fs / openpromfs / inode.c

diff --git a/fs/openpromfs/inode.c b/fs/openpromfs/inode.c
index e6cb768..40c8c2e 100644 (file)
--- a/fs/openpromfs/inode.c
+++ b/fs/openpromfs/inode.c
@@ -9,6 +9,7 @@
 #include <linux/types.h>
 #include <linux/string.h>
 #include <linux/fs.h>
+#include <linux/fs_context.h>
 #include <linux/init.h>
 #include <linux/slab.h>
 #include <linux/seq_file.h>
@@ -375,7 +376,7 @@ static const struct super_operations openprom_sops = {
        .remount_fs     = openprom_remount,
 };
 
-static int openprom_fill_super(struct super_block *s, void *data, int silent)
+static int openprom_fill_super(struct super_block *s, struct fs_context *fc)
 {
        struct inode *root_inode;
        struct op_inode_info *oi;
@@ -409,16 +410,25 @@ out_no_root:
        return ret;
 }
 
-static struct dentry *openprom_mount(struct file_system_type *fs_type,
-       int flags, const char *dev_name, void *data)
+static int openpromfs_get_tree(struct fs_context *fc)
 {
-       return mount_single(fs_type, flags, data, openprom_fill_super);
+       return get_tree_single(fc, openprom_fill_super);
+}
+
+static const struct fs_context_operations openpromfs_context_ops = {
+       .get_tree       = openpromfs_get_tree,
+};
+
+static int openpromfs_init_fs_context(struct fs_context *fc)
+{
+       fc->ops = &openpromfs_context_ops;
+       return 0;
 }
 
 static struct file_system_type openprom_fs_type = {
        .owner          = THIS_MODULE,
        .name           = "openpromfs",
-       .mount          = openprom_mount,
+       .init_fs_context = openpromfs_init_fs_context,
        .kill_sb        = kill_anon_super,
 };
 MODULE_ALIAS_FS("openpromfs");