Signed-off-by: David Howells <dhowells@xxxxxxxxxx> cc: netdev@xxxxxxxxxxxxxxx --- net/socket.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/net/socket.c b/net/socket.c index 3c176a12fe48..40d0ed85d61a 100644 --- a/net/socket.c +++ b/net/socket.c @@ -79,6 +79,7 @@ #include <linux/module.h> #include <linux/highmem.h> #include <linux/mount.h> +#include <linux/fs_context.h> #include <linux/security.h> #include <linux/syscalls.h> #include <linux/compat.h> @@ -351,19 +352,20 @@ static const struct xattr_handler *sockfs_xattr_handlers[] = { NULL }; -static struct dentry *sockfs_mount(struct file_system_type *fs_type, - int flags, const char *dev_name, void *data) +static int sockfs_init_fs_context(struct fs_context *fc) { - return mount_pseudo_xattr(fs_type, "socket:", &sockfs_ops, - sockfs_xattr_handlers, - &sockfs_dentry_operations, SOCKFS_MAGIC); + return vfs_init_pseudo_fs_context(fc, "socket:", + &sockfs_ops, + sockfs_xattr_handlers, + &sockfs_dentry_operations, + SOCKFS_MAGIC); } static struct vfsmount *sock_mnt __read_mostly; static struct file_system_type sock_fs_type = { .name = "sockfs", - .mount = sockfs_mount, + .init_fs_context = sockfs_init_fs_context, .kill_sb = kill_anon_super, };