aboutsummaryrefslogtreecommitdiffstats
path: root/security
diff options
context:
space:
mode:
Diffstat (limited to 'security')
-rw-r--r--security/dummy.c8
-rw-r--r--security/security.c6
-rw-r--r--security/selinux/hooks.c1
3 files changed, 0 insertions, 15 deletions
diff --git a/security/dummy.c b/security/dummy.c
index c155f08e9dd8..793856691641 100644
--- a/security/dummy.c
+++ b/security/dummy.c
@@ -252,13 +252,6 @@ static void dummy_sb_post_pivotroot (struct path *old_path, struct path *new_pat
252 return; 252 return;
253} 253}
254 254
255static int dummy_sb_get_mnt_opts(const struct super_block *sb,
256 struct security_mnt_opts *opts)
257{
258 security_init_mnt_opts(opts);
259 return 0;
260}
261
262static int dummy_sb_set_mnt_opts(struct super_block *sb, 255static int dummy_sb_set_mnt_opts(struct super_block *sb,
263 struct security_mnt_opts *opts) 256 struct security_mnt_opts *opts)
264{ 257{
@@ -1104,7 +1097,6 @@ void security_fixup_ops (struct security_operations *ops)
1104 set_to_dummy_if_null(ops, sb_post_addmount); 1097 set_to_dummy_if_null(ops, sb_post_addmount);
1105 set_to_dummy_if_null(ops, sb_pivotroot); 1098 set_to_dummy_if_null(ops, sb_pivotroot);
1106 set_to_dummy_if_null(ops, sb_post_pivotroot); 1099 set_to_dummy_if_null(ops, sb_post_pivotroot);
1107 set_to_dummy_if_null(ops, sb_get_mnt_opts);
1108 set_to_dummy_if_null(ops, sb_set_mnt_opts); 1100 set_to_dummy_if_null(ops, sb_set_mnt_opts);
1109 set_to_dummy_if_null(ops, sb_clone_mnt_opts); 1101 set_to_dummy_if_null(ops, sb_clone_mnt_opts);
1110 set_to_dummy_if_null(ops, sb_parse_opts_str); 1102 set_to_dummy_if_null(ops, sb_parse_opts_str);
diff --git a/security/security.c b/security/security.c
index de74fdccde26..28b2860c1129 100644
--- a/security/security.c
+++ b/security/security.c
@@ -348,12 +348,6 @@ void security_sb_post_pivotroot(struct path *old_path, struct path *new_path)
348 security_ops->sb_post_pivotroot(old_path, new_path); 348 security_ops->sb_post_pivotroot(old_path, new_path);
349} 349}
350 350
351int security_sb_get_mnt_opts(const struct super_block *sb,
352 struct security_mnt_opts *opts)
353{
354 return security_ops->sb_get_mnt_opts(sb, opts);
355}
356
357int security_sb_set_mnt_opts(struct super_block *sb, 351int security_sb_set_mnt_opts(struct super_block *sb,
358 struct security_mnt_opts *opts) 352 struct security_mnt_opts *opts)
359{ 353{
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index 33dee83fdd2f..745a69e74e38 100644
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -5421,7 +5421,6 @@ static struct security_operations selinux_ops = {
5421 .sb_statfs = selinux_sb_statfs, 5421 .sb_statfs = selinux_sb_statfs,
5422 .sb_mount = selinux_mount, 5422 .sb_mount = selinux_mount,
5423 .sb_umount = selinux_umount, 5423 .sb_umount = selinux_umount,
5424 .sb_get_mnt_opts = selinux_get_mnt_opts,
5425 .sb_set_mnt_opts = selinux_set_mnt_opts, 5424 .sb_set_mnt_opts = selinux_set_mnt_opts,
5426 .sb_clone_mnt_opts = selinux_sb_clone_mnt_opts, 5425 .sb_clone_mnt_opts = selinux_sb_clone_mnt_opts,
5427 .sb_parse_opts_str = selinux_parse_opts_str, 5426 .sb_parse_opts_str = selinux_parse_opts_str,