Commit 920f50b2 authored by David Howells's avatar David Howells Committed by Al Viro
Browse files

vfs: Convert selinuxfs to use the new mount API 



Convert the selinuxfs 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: Paul Moore <paul@paul-moore.com>
cc: Stephen Smalley <sds@tycho.nsa.gov>
cc: Eric Paris <eparis@parisplace.org>
cc: selinux@vger.kernel.org
cc: linux-security-module@vger.kernel.org
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 5c86d7e0

security/selinux/selinuxfs.c

+15 −5
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include <linux/slab.h>

#include <linux/vmalloc.h>

#include <linux/fs.h>

#include <linux/fs_context.h>

#include <linux/mount.h>

#include <linux/mutex.h>

#include <linux/init.h>
@@ -1893,7 +1894,7 @@ static struct dentry *sel_make_dir(struct dentry *dir, const char *name, 


#define NULL_FILE_NAME "null"



static int sel_fill_super(struct super_block *sb, void *data, int silent)

static int sel_fill_super(struct super_block *sb, struct fs_context *fc)

{

	struct selinux_fs_info *fsi;

	int ret;
@@ -2009,10 +2010,19 @@ err: 
	return ret;

}



static struct dentry *sel_mount(struct file_system_type *fs_type,

		      int flags, const char *dev_name, void *data)

static int sel_get_tree(struct fs_context *fc)

{

	return mount_single(fs_type, flags, data, sel_fill_super);

	return get_tree_single(fc, sel_fill_super);

}



static const struct fs_context_operations sel_context_ops = {

	.get_tree	= sel_get_tree,

};



static int sel_init_fs_context(struct fs_context *fc)

{

	fc->ops = &sel_context_ops;

	return 0;

}



static void sel_kill_sb(struct super_block *sb)
@@ -2023,7 +2033,7 @@ static void sel_kill_sb(struct super_block *sb) 


static struct file_system_type sel_fs_type = {

	.name		= "selinuxfs",

	.mount		= sel_mount,

	.init_fs_context = sel_init_fs_context,

	.kill_sb	= sel_kill_sb,

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE