Commit b478a9f9 authored by Miklos Szeredi's avatar Miklos Szeredi Committed by James Morris
Browse files

security: remove unused sb_get_mnt_opts hook 



The sb_get_mnt_opts() hook is unused, and is superseded by the
sb_show_options() hook.

Signed-off-by: default avatarMiklos Szeredi <mszeredi@suse.cz>
Acked-by: default avatarJames Morris <jmorris@namei.org>
parent 2069f457

include/linux/security.h

+0 −14
Original line number Diff line number Diff line
@@ -291,10 +291,6 @@ static inline void security_free_mnt_opts(struct security_mnt_opts *opts) 
 *	Update module state after a successful pivot.

 *	@old_path contains the path for the old root.

 *	@new_path contains the path for the new root.

 * @sb_get_mnt_opts:

 *	Get the security relevant mount options used for a superblock

 *	@sb the superblock to get security mount options from

 *	@opts binary data structure containing all lsm mount data

 * @sb_set_mnt_opts:

 *	Set the security relevant mount options used for a superblock

 *	@sb the superblock to set security mount options for
@@ -1348,8 +1344,6 @@ struct security_operations { 
			     struct path *new_path);

	void (*sb_post_pivotroot) (struct path *old_path,

				   struct path *new_path);

	int (*sb_get_mnt_opts) (const struct super_block *sb,

				struct security_mnt_opts *opts);

	int (*sb_set_mnt_opts) (struct super_block *sb,

				struct security_mnt_opts *opts);

	void (*sb_clone_mnt_opts) (const struct super_block *oldsb,
@@ -1624,8 +1618,6 @@ void security_sb_post_remount(struct vfsmount *mnt, unsigned long flags, void *d 
void security_sb_post_addmount(struct vfsmount *mnt, struct path *mountpoint);

int security_sb_pivotroot(struct path *old_path, struct path *new_path);

void security_sb_post_pivotroot(struct path *old_path, struct path *new_path);

int security_sb_get_mnt_opts(const struct super_block *sb,

				struct security_mnt_opts *opts);

int security_sb_set_mnt_opts(struct super_block *sb, struct security_mnt_opts *opts);

void security_sb_clone_mnt_opts(const struct super_block *oldsb,

				struct super_block *newsb);
@@ -1942,12 +1934,6 @@ static inline int security_sb_pivotroot(struct path *old_path, 
static inline void security_sb_post_pivotroot(struct path *old_path,

					      struct path *new_path)

{ }

static inline int security_sb_get_mnt_opts(const struct super_block *sb,

					   struct security_mnt_opts *opts)

{

	security_init_mnt_opts(opts);

	return 0;

}



static inline int security_sb_set_mnt_opts(struct super_block *sb,

					   struct security_mnt_opts *opts)

security/dummy.c

+0 −8
Original line number Diff line number Diff line
@@ -252,13 +252,6 @@ static void dummy_sb_post_pivotroot (struct path *old_path, struct path *new_pat 
	return;

}



static int dummy_sb_get_mnt_opts(const struct super_block *sb,

				 struct security_mnt_opts *opts)

{

	security_init_mnt_opts(opts);

	return 0;

}



static int dummy_sb_set_mnt_opts(struct super_block *sb,

				 struct security_mnt_opts *opts)

{
@@ -1104,7 +1097,6 @@ void security_fixup_ops (struct security_operations *ops) 
	set_to_dummy_if_null(ops, sb_post_addmount);

	set_to_dummy_if_null(ops, sb_pivotroot);

	set_to_dummy_if_null(ops, sb_post_pivotroot);

	set_to_dummy_if_null(ops, sb_get_mnt_opts);

	set_to_dummy_if_null(ops, sb_set_mnt_opts);

	set_to_dummy_if_null(ops, sb_clone_mnt_opts);

	set_to_dummy_if_null(ops, sb_parse_opts_str);

security/security.c

+0 −6
Original line number Diff line number Diff line
@@ -348,12 +348,6 @@ void security_sb_post_pivotroot(struct path *old_path, struct path *new_path) 
	security_ops->sb_post_pivotroot(old_path, new_path);

}



int security_sb_get_mnt_opts(const struct super_block *sb,

				struct security_mnt_opts *opts)

{

	return security_ops->sb_get_mnt_opts(sb, opts);

}



int security_sb_set_mnt_opts(struct super_block *sb,

				struct security_mnt_opts *opts)

{

security/selinux/hooks.c

+0 −1
Original line number Diff line number Diff line
@@ -5421,7 +5421,6 @@ static struct security_operations selinux_ops = { 
	.sb_statfs =			selinux_sb_statfs,

	.sb_mount =			selinux_mount,

	.sb_umount =			selinux_umount,

	.sb_get_mnt_opts =		selinux_get_mnt_opts,

	.sb_set_mnt_opts =		selinux_set_mnt_opts,

	.sb_clone_mnt_opts =		selinux_sb_clone_mnt_opts,

	.sb_parse_opts_str = 		selinux_parse_opts_str,