diff options
Diffstat (limited to 'security')
-rw-r--r-- | security/dummy.c | 6 | ||||
-rw-r--r-- | security/security.c | 5 |
2 files changed, 0 insertions, 11 deletions
diff --git a/security/dummy.c b/security/dummy.c index a3b29d0d00e5..8e34e03415f8 100644 --- a/security/dummy.c +++ b/security/dummy.c | |||
@@ -225,11 +225,6 @@ static void dummy_sb_post_remount (struct vfsmount *mnt, unsigned long flags, | |||
225 | } | 225 | } |
226 | 226 | ||
227 | 227 | ||
228 | static void dummy_sb_post_mountroot (void) | ||
229 | { | ||
230 | return; | ||
231 | } | ||
232 | |||
233 | static void dummy_sb_post_addmount (struct vfsmount *mnt, struct nameidata *nd) | 228 | static void dummy_sb_post_addmount (struct vfsmount *mnt, struct nameidata *nd) |
234 | { | 229 | { |
235 | return; | 230 | return; |
@@ -1017,7 +1012,6 @@ void security_fixup_ops (struct security_operations *ops) | |||
1017 | set_to_dummy_if_null(ops, sb_umount_close); | 1012 | set_to_dummy_if_null(ops, sb_umount_close); |
1018 | set_to_dummy_if_null(ops, sb_umount_busy); | 1013 | set_to_dummy_if_null(ops, sb_umount_busy); |
1019 | set_to_dummy_if_null(ops, sb_post_remount); | 1014 | set_to_dummy_if_null(ops, sb_post_remount); |
1020 | set_to_dummy_if_null(ops, sb_post_mountroot); | ||
1021 | set_to_dummy_if_null(ops, sb_post_addmount); | 1015 | set_to_dummy_if_null(ops, sb_post_addmount); |
1022 | set_to_dummy_if_null(ops, sb_pivotroot); | 1016 | set_to_dummy_if_null(ops, sb_pivotroot); |
1023 | set_to_dummy_if_null(ops, sb_post_pivotroot); | 1017 | set_to_dummy_if_null(ops, sb_post_pivotroot); |
diff --git a/security/security.c b/security/security.c index b13b54f0af85..5068808343d0 100644 --- a/security/security.c +++ b/security/security.c | |||
@@ -288,11 +288,6 @@ void security_sb_post_remount(struct vfsmount *mnt, unsigned long flags, void *d | |||
288 | security_ops->sb_post_remount(mnt, flags, data); | 288 | security_ops->sb_post_remount(mnt, flags, data); |
289 | } | 289 | } |
290 | 290 | ||
291 | void security_sb_post_mountroot(void) | ||
292 | { | ||
293 | security_ops->sb_post_mountroot(); | ||
294 | } | ||
295 | |||
296 | void security_sb_post_addmount(struct vfsmount *mnt, struct nameidata *mountpoint_nd) | 291 | void security_sb_post_addmount(struct vfsmount *mnt, struct nameidata *mountpoint_nd) |
297 | { | 292 | { |
298 | security_ops->sb_post_addmount(mnt, mountpoint_nd); | 293 | security_ops->sb_post_addmount(mnt, mountpoint_nd); |