Commit bc99a664 authored by David Howells's avatar David Howells Committed by Al Viro

vfs: Convert binfmt_misc to use the new mount API

Convert the binfmt_misc filesystem to the new internal mount API as the old
one will be obsoleted and removed.  This allows greater flexibility in
communication of mount parameters between userspace, the VFS and the
filesystem.

See Documentation/filesystems/mount_api.txt for more information.
Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
cc: Alexander Viro <viro@zeniv.linux.org.uk>
cc: linux-fsdevel@vger.kernel.org
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent c23a0bba
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
#include <linux/pagemap.h> #include <linux/pagemap.h>
#include <linux/namei.h> #include <linux/namei.h>
#include <linux/mount.h> #include <linux/mount.h>
#include <linux/fs_context.h>
#include <linux/syscalls.h> #include <linux/syscalls.h>
#include <linux/fs.h> #include <linux/fs.h>
#include <linux/uaccess.h> #include <linux/uaccess.h>
...@@ -820,7 +821,7 @@ static const struct super_operations s_ops = { ...@@ -820,7 +821,7 @@ static const struct super_operations s_ops = {
.evict_inode = bm_evict_inode, .evict_inode = bm_evict_inode,
}; };
static int bm_fill_super(struct super_block *sb, void *data, int silent) static int bm_fill_super(struct super_block *sb, struct fs_context *fc)
{ {
int err; int err;
static const struct tree_descr bm_files[] = { static const struct tree_descr bm_files[] = {
...@@ -835,10 +836,19 @@ static int bm_fill_super(struct super_block *sb, void *data, int silent) ...@@ -835,10 +836,19 @@ static int bm_fill_super(struct super_block *sb, void *data, int silent)
return err; return err;
} }
static struct dentry *bm_mount(struct file_system_type *fs_type, static int bm_get_tree(struct fs_context *fc)
int flags, const char *dev_name, void *data)
{ {
return mount_single(fs_type, flags, data, bm_fill_super); return get_tree_single(fc, bm_fill_super);
}
static const struct fs_context_operations bm_context_ops = {
.get_tree = bm_get_tree,
};
static int bm_init_fs_context(struct fs_context *fc)
{
fc->ops = &bm_context_ops;
return 0;
} }
static struct linux_binfmt misc_format = { static struct linux_binfmt misc_format = {
...@@ -849,7 +859,7 @@ static struct linux_binfmt misc_format = { ...@@ -849,7 +859,7 @@ static struct linux_binfmt misc_format = {
static struct file_system_type bm_fs_type = { static struct file_system_type bm_fs_type = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.name = "binfmt_misc", .name = "binfmt_misc",
.mount = bm_mount, .init_fs_context = bm_init_fs_context,
.kill_sb = kill_litter_super, .kill_sb = kill_litter_super,
}; };
MODULE_ALIAS_FS("binfmt_misc"); MODULE_ALIAS_FS("binfmt_misc");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment