aboutsummaryrefslogtreecommitdiffstats
path: root/security
diff options
context:
space:
mode:
authorEric Paris <eparis@redhat.com>2010-04-07 15:14:45 -0400
committerJames Morris <jmorris@namei.org>2010-04-11 22:18:32 -0400
commit91a9420f5826db482030c21eca8c507271bbc441 (patch)
treee5e400622884c8c0cd373c51ee4a3822c853aaa5 /security
parent3db291017753e539af64c8bab373785f34e43ed2 (diff)
security: remove dead hook sb_post_pivotroot
Unused hook. Remove. Signed-off-by: Eric Paris <eparis@redhat.com> Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'security')
-rw-r--r--security/capability.c5
-rw-r--r--security/security.c5
2 files changed, 0 insertions, 10 deletions
diff --git a/security/capability.c b/security/capability.c
index 38752ddf69d7..b64b50105a04 100644
--- a/security/capability.c
+++ b/security/capability.c
@@ -90,10 +90,6 @@ static int cap_sb_pivotroot(struct path *old_path, struct path *new_path)
90 return 0; 90 return 0;
91} 91}
92 92
93static void cap_sb_post_pivotroot(struct path *old_path, struct path *new_path)
94{
95}
96
97static int cap_sb_set_mnt_opts(struct super_block *sb, 93static int cap_sb_set_mnt_opts(struct super_block *sb,
98 struct security_mnt_opts *opts) 94 struct security_mnt_opts *opts)
99{ 95{
@@ -921,7 +917,6 @@ void security_fixup_ops(struct security_operations *ops)
921 set_to_cap_if_null(ops, sb_mount); 917 set_to_cap_if_null(ops, sb_mount);
922 set_to_cap_if_null(ops, sb_umount); 918 set_to_cap_if_null(ops, sb_umount);
923 set_to_cap_if_null(ops, sb_pivotroot); 919 set_to_cap_if_null(ops, sb_pivotroot);
924 set_to_cap_if_null(ops, sb_post_pivotroot);
925 set_to_cap_if_null(ops, sb_set_mnt_opts); 920 set_to_cap_if_null(ops, sb_set_mnt_opts);
926 set_to_cap_if_null(ops, sb_clone_mnt_opts); 921 set_to_cap_if_null(ops, sb_clone_mnt_opts);
927 set_to_cap_if_null(ops, sb_parse_opts_str); 922 set_to_cap_if_null(ops, sb_parse_opts_str);
diff --git a/security/security.c b/security/security.c
index 6a8e5411d7a0..5223fa408271 100644
--- a/security/security.c
+++ b/security/security.c
@@ -316,11 +316,6 @@ int security_sb_pivotroot(struct path *old_path, struct path *new_path)
316 return security_ops->sb_pivotroot(old_path, new_path); 316 return security_ops->sb_pivotroot(old_path, new_path);
317} 317}
318 318
319void security_sb_post_pivotroot(struct path *old_path, struct path *new_path)
320{
321 security_ops->sb_post_pivotroot(old_path, new_path);
322}
323
324int security_sb_set_mnt_opts(struct super_block *sb, 319int security_sb_set_mnt_opts(struct super_block *sb,
325 struct security_mnt_opts *opts) 320 struct security_mnt_opts *opts)
326{ 321{