mirror of
https://github.com/tbsdtv/linux_media.git
synced 2025-07-23 04:33:26 +02:00
Merge branch 'work.mount0' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull vfs mount updates from Al Viro: "The first part of mount updates. Convert filesystems to use the new mount API" * 'work.mount0' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (63 commits) mnt_init(): call shmem_init() unconditionally constify ksys_mount() string arguments don't bother with registering rootfs init_rootfs(): don't bother with init_ramfs_fs() vfs: Convert smackfs to use the new mount API vfs: Convert selinuxfs to use the new mount API vfs: Convert securityfs to use the new mount API vfs: Convert apparmorfs to use the new mount API vfs: Convert openpromfs to use the new mount API vfs: Convert xenfs to use the new mount API vfs: Convert gadgetfs to use the new mount API vfs: Convert oprofilefs to use the new mount API vfs: Convert ibmasmfs to use the new mount API vfs: Convert qib_fs/ipathfs to use the new mount API vfs: Convert efivarfs to use the new mount API vfs: Convert configfs to use the new mount API vfs: Convert binfmt_misc to use the new mount API convenience helper: get_tree_single() convenience helper get_tree_nodev() vfs: Kill sget_userns() ...
This commit is contained in:
@@ -13,6 +13,7 @@
|
||||
#include <linux/sysfs.h>
|
||||
#include <linux/kobject.h>
|
||||
#include <linux/fs.h>
|
||||
#include <linux/fs_context.h>
|
||||
#include <linux/mount.h>
|
||||
#include <linux/pagemap.h>
|
||||
#include <linux/init.h>
|
||||
@@ -36,7 +37,7 @@ static const struct super_operations securityfs_super_operations = {
|
||||
.free_inode = securityfs_free_inode,
|
||||
};
|
||||
|
||||
static int fill_super(struct super_block *sb, void *data, int silent)
|
||||
static int securityfs_fill_super(struct super_block *sb, struct fs_context *fc)
|
||||
{
|
||||
static const struct tree_descr files[] = {{""}};
|
||||
int error;
|
||||
@@ -50,17 +51,25 @@ static int fill_super(struct super_block *sb, void *data, int silent)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static struct dentry *get_sb(struct file_system_type *fs_type,
|
||||
int flags, const char *dev_name,
|
||||
void *data)
|
||||
static int securityfs_get_tree(struct fs_context *fc)
|
||||
{
|
||||
return mount_single(fs_type, flags, data, fill_super);
|
||||
return get_tree_single(fc, securityfs_fill_super);
|
||||
}
|
||||
|
||||
static const struct fs_context_operations securityfs_context_ops = {
|
||||
.get_tree = securityfs_get_tree,
|
||||
};
|
||||
|
||||
static int securityfs_init_fs_context(struct fs_context *fc)
|
||||
{
|
||||
fc->ops = &securityfs_context_ops;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static struct file_system_type fs_type = {
|
||||
.owner = THIS_MODULE,
|
||||
.name = "securityfs",
|
||||
.mount = get_sb,
|
||||
.init_fs_context = securityfs_init_fs_context,
|
||||
.kill_sb = kill_litter_super,
|
||||
};
|
||||
|
||||
|
Reference in New Issue
Block a user