aboutsummaryrefslogtreecommitdiffstats
path: root/security
diff options
context:
space:
mode:
authorEric Paris <eparis@redhat.com>2010-04-07 15:14:15 -0400
committerJames Morris <jmorris@namei.org>2010-04-11 22:18:28 -0400
commit353633100d8d684ac0acae4ce93fb833f92881f4 (patch)
treed45effdd09f5ef2f2c44bbcfcca8751cc5cdbd7d /security
parentc1a7368a6f0b18b10fdec87972da680ebdf03794 (diff)
security: remove sb_check_sb hooks
Unused hook. Remove it. 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.c6
-rw-r--r--security/security.c5
2 files changed, 0 insertions, 11 deletions
diff --git a/security/capability.c b/security/capability.c
index 4875142b858d..a7e905d8f1d3 100644
--- a/security/capability.c
+++ b/security/capability.c
@@ -80,11 +80,6 @@ static int cap_sb_mount(char *dev_name, struct path *path, char *type,
80 return 0; 80 return 0;
81} 81}
82 82
83static int cap_sb_check_sb(struct vfsmount *mnt, struct path *path)
84{
85 return 0;
86}
87
88static int cap_sb_umount(struct vfsmount *mnt, int flags) 83static int cap_sb_umount(struct vfsmount *mnt, int flags)
89{ 84{
90 return 0; 85 return 0;
@@ -941,7 +936,6 @@ void security_fixup_ops(struct security_operations *ops)
941 set_to_cap_if_null(ops, sb_show_options); 936 set_to_cap_if_null(ops, sb_show_options);
942 set_to_cap_if_null(ops, sb_statfs); 937 set_to_cap_if_null(ops, sb_statfs);
943 set_to_cap_if_null(ops, sb_mount); 938 set_to_cap_if_null(ops, sb_mount);
944 set_to_cap_if_null(ops, sb_check_sb);
945 set_to_cap_if_null(ops, sb_umount); 939 set_to_cap_if_null(ops, sb_umount);
946 set_to_cap_if_null(ops, sb_umount_close); 940 set_to_cap_if_null(ops, sb_umount_close);
947 set_to_cap_if_null(ops, sb_umount_busy); 941 set_to_cap_if_null(ops, sb_umount_busy);
diff --git a/security/security.c b/security/security.c
index b98334b0a576..a0bee70ed4b6 100644
--- a/security/security.c
+++ b/security/security.c
@@ -306,11 +306,6 @@ int security_sb_mount(char *dev_name, struct path *path,
306 return security_ops->sb_mount(dev_name, path, type, flags, data); 306 return security_ops->sb_mount(dev_name, path, type, flags, data);
307} 307}
308 308
309int security_sb_check_sb(struct vfsmount *mnt, struct path *path)
310{
311 return security_ops->sb_check_sb(mnt, path);
312}
313
314int security_sb_umount(struct vfsmount *mnt, int flags) 309int security_sb_umount(struct vfsmount *mnt, int flags)
315{ 310{
316 return security_ops->sb_umount(mnt, flags); 311 return security_ops->sb_umount(mnt, flags);