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>

diff --git a/fs/namespace.c b/fs/namespace.c
index 8aea78c8e760c46be82d57d5dfc5fe4e7f751538..6c9ca7358aad0e8bacd98953e40b7e5b1eabf5c5 100644 (file)
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -1116,8 +1116,6 @@ static int do_umount(struct vfsmount *mnt, int flags)
                retval = 0;
        }
        spin_unlock(&vfsmount_lock);
-       if (retval)
-               security_sb_umount_busy(mnt);
        up_write(&namespace_sem);
        release_mounts(&umount_list);
        return retval;

diff --git a/include/linux/security.h b/include/linux/security.h
index 354b0ceefc87a6501e28c6be33b247ffe8f54e03..b206795c09f7034214c2b20177d05c9c09bcf798 100644 (file)
--- a/include/linux/security.h
+++ b/include/linux/security.h
@@ -272,12 +272,6 @@ static inline void security_free_mnt_opts(struct security_mnt_opts *opts)
  *     @mnt contains the mounted file system.
  *     @flags contains the unmount flags, e.g. MNT_FORCE.
  *     Return 0 if permission is granted.
- * @sb_umount_busy:
- *     Handle a failed umount of the @mnt mounted filesystem, e.g.  re-opening
- *     any files that were closed by umount_close.  This hook is called during
- *     an umount operation if the umount fails after a call to the
- *     umount_close hook.
- *     @mnt contains the mounted filesystem.
  * @sb_post_remount:
  *     Update the security module's state when a filesystem is remounted.
  *     This hook is only called if the remount was successful.
@@ -1474,7 +1468,6 @@ struct security_operations {
        int (*sb_mount) (char *dev_name, struct path *path,
                         char *type, unsigned long flags, void *data);
        int (*sb_umount) (struct vfsmount *mnt, int flags);
-       void (*sb_umount_busy) (struct vfsmount *mnt);
        void (*sb_post_remount) (struct vfsmount *mnt,
                                 unsigned long flags, void *data);
        void (*sb_post_addmount) (struct vfsmount *mnt,
@@ -1771,7 +1764,6 @@ int security_sb_statfs(struct dentry *dentry);
 int security_sb_mount(char *dev_name, struct path *path,
                      char *type, unsigned long flags, void *data);
 int security_sb_umount(struct vfsmount *mnt, int flags);
-void security_sb_umount_busy(struct vfsmount *mnt);
 void security_sb_post_remount(struct vfsmount *mnt, unsigned long flags, void *data);
 void security_sb_post_addmount(struct vfsmount *mnt, struct path *mountpoint);
 int security_sb_pivotroot(struct path *old_path, struct path *new_path);
@@ -2089,9 +2081,6 @@ static inline int security_sb_umount(struct vfsmount *mnt, int flags)
        return 0;
 }
 
-static inline void security_sb_umount_busy(struct vfsmount *mnt)
-{ }
-
 static inline void security_sb_post_remount(struct vfsmount *mnt,
                                             unsigned long flags, void *data)
 { }

diff --git a/security/capability.c b/security/capability.c
index db72f4f5a9e1b98e8c48dbea917a84b6f781d779..476d43030906716490f63ef354bc2dd9060efff2 100644 (file)
--- a/security/capability.c
+++ b/security/capability.c
@@ -85,10 +85,6 @@ static int cap_sb_umount(struct vfsmount *mnt, int flags)
        return 0;
 }
 
-static void cap_sb_umount_busy(struct vfsmount *mnt)
-{
-}
-
 static void cap_sb_post_remount(struct vfsmount *mnt, unsigned long flags,
                                void *data)
 {
@@ -933,7 +929,6 @@ void security_fixup_ops(struct security_operations *ops)
        set_to_cap_if_null(ops, sb_statfs);
        set_to_cap_if_null(ops, sb_mount);
        set_to_cap_if_null(ops, sb_umount);
-       set_to_cap_if_null(ops, sb_umount_busy);
        set_to_cap_if_null(ops, sb_post_remount);
        set_to_cap_if_null(ops, sb_post_addmount);
        set_to_cap_if_null(ops, sb_pivotroot);

diff --git a/security/security.c b/security/security.c
index 591c25fd430f056426969f6a47b9d661700c3d49..c1341fbe98ca100f4c2ef49d4e3081bbf6ba2b00 100644 (file)
--- a/security/security.c
+++ b/security/security.c
@@ -311,11 +311,6 @@ int security_sb_umount(struct vfsmount *mnt, int flags)
        return security_ops->sb_umount(mnt, flags);
 }
 
-void security_sb_umount_busy(struct vfsmount *mnt)
-{
-       security_ops->sb_umount_busy(mnt);
-}
-
 void security_sb_post_remount(struct vfsmount *mnt, unsigned long flags, void *data)
 {
        security_ops->sb_post_remount(mnt, flags, data);