aboutsummaryrefslogtreecommitdiffstats
path: root/security
diff options
context:
space:
mode:
authorEric Paris <eparis@redhat.com>2010-04-07 15:14:27 -0400
committerJames Morris <jmorris@namei.org>2010-04-11 22:18:30 -0400
commit4b61d12c84293ac061909f27f567c1905e4d90e3 (patch)
treedfab10311d1b6be7667600307c72379c6779d32d /security
parent231923bd0e06cba69f7c2028f4a68602b8d22160 (diff)
security: remove dead hook sb_umount_busy
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 db72f4f5a9e1..476d43030906 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
88static void cap_sb_umount_busy(struct vfsmount *mnt)
89{
90}
91
92static void cap_sb_post_remount(struct vfsmount *mnt, unsigned long flags, 88static void cap_sb_post_remount(struct vfsmount *mnt, unsigned long flags,
93 void *data) 89 void *data)
94{ 90{
@@ -933,7 +929,6 @@ void security_fixup_ops(struct security_operations *ops)
933 set_to_cap_if_null(ops, sb_statfs); 929 set_to_cap_if_null(ops, sb_statfs);
934 set_to_cap_if_null(ops, sb_mount); 930 set_to_cap_if_null(ops, sb_mount);
935 set_to_cap_if_null(ops, sb_umount); 931 set_to_cap_if_null(ops, sb_umount);
936 set_to_cap_if_null(ops, sb_umount_busy);
937 set_to_cap_if_null(ops, sb_post_remount); 932 set_to_cap_if_null(ops, sb_post_remount);
938 set_to_cap_if_null(ops, sb_post_addmount); 933 set_to_cap_if_null(ops, sb_post_addmount);
939 set_to_cap_if_null(ops, sb_pivotroot); 934 set_to_cap_if_null(ops, sb_pivotroot);
diff --git a/security/security.c b/security/security.c
index 591c25fd430f..c1341fbe98ca 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
314void security_sb_umount_busy(struct vfsmount *mnt)
315{
316 security_ops->sb_umount_busy(mnt);
317}
318
319void security_sb_post_remount(struct vfsmount *mnt, unsigned long flags, void *data) 314void security_sb_post_remount(struct vfsmount *mnt, unsigned long flags, void *data)
320{ 315{
321 security_ops->sb_post_remount(mnt, flags, data); 316 security_ops->sb_post_remount(mnt, flags, data);