diff options
Diffstat (limited to 'security')
-rw-r--r-- | security/capability.c | 5 | ||||
-rw-r--r-- | security/security.c | 5 |
2 files changed, 0 insertions, 10 deletions
diff --git a/security/capability.c b/security/capability.c index 26fc92caa339..38752ddf69d7 100644 --- a/security/capability.c +++ b/security/capability.c | |||
@@ -85,10 +85,6 @@ static int cap_sb_umount(struct vfsmount *mnt, int flags) | |||
85 | return 0; | 85 | return 0; |
86 | } | 86 | } |
87 | 87 | ||
88 | static void cap_sb_post_addmount(struct vfsmount *mnt, struct path *path) | ||
89 | { | ||
90 | } | ||
91 | |||
92 | static int cap_sb_pivotroot(struct path *old_path, struct path *new_path) | 88 | static int cap_sb_pivotroot(struct path *old_path, struct path *new_path) |
93 | { | 89 | { |
94 | return 0; | 90 | return 0; |
@@ -924,7 +920,6 @@ void security_fixup_ops(struct security_operations *ops) | |||
924 | set_to_cap_if_null(ops, sb_statfs); | 920 | set_to_cap_if_null(ops, sb_statfs); |
925 | set_to_cap_if_null(ops, sb_mount); | 921 | set_to_cap_if_null(ops, sb_mount); |
926 | set_to_cap_if_null(ops, sb_umount); | 922 | set_to_cap_if_null(ops, sb_umount); |
927 | set_to_cap_if_null(ops, sb_post_addmount); | ||
928 | set_to_cap_if_null(ops, sb_pivotroot); | 923 | set_to_cap_if_null(ops, sb_pivotroot); |
929 | set_to_cap_if_null(ops, sb_post_pivotroot); | 924 | set_to_cap_if_null(ops, sb_post_pivotroot); |
930 | set_to_cap_if_null(ops, sb_set_mnt_opts); | 925 | set_to_cap_if_null(ops, sb_set_mnt_opts); |
diff --git a/security/security.c b/security/security.c index d9538d98736b..6a8e5411d7a0 100644 --- a/security/security.c +++ b/security/security.c | |||
@@ -311,11 +311,6 @@ int security_sb_umount(struct vfsmount *mnt, int flags) | |||
311 | return security_ops->sb_umount(mnt, flags); | 311 | return security_ops->sb_umount(mnt, flags); |
312 | } | 312 | } |
313 | 313 | ||
314 | void security_sb_post_addmount(struct vfsmount *mnt, struct path *mountpoint) | ||
315 | { | ||
316 | security_ops->sb_post_addmount(mnt, mountpoint); | ||
317 | } | ||
318 | |||
319 | int security_sb_pivotroot(struct path *old_path, struct path *new_path) | 314 | int security_sb_pivotroot(struct path *old_path, struct path *new_path) |
320 | { | 315 | { |
321 | return security_ops->sb_pivotroot(old_path, new_path); | 316 | return security_ops->sb_pivotroot(old_path, new_path); |