summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorEric Paris <eparis@redhat.com>2010-04-07 19:14:27 (GMT)
committerJames Morris <jmorris@namei.org>2010-04-12 02:18:30 (GMT)
commit4b61d12c84293ac061909f27f567c1905e4d90e3 (patch)
treedfab10311d1b6be7667600307c72379c6779d32d /include
parent231923bd0e06cba69f7c2028f4a68602b8d22160 (diff)
downloadlinux-4b61d12c84293ac061909f27f567c1905e4d90e3.tar.xz
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 'include')
-rw-r--r--include/linux/security.h11
1 files changed, 0 insertions, 11 deletions
diff --git a/include/linux/security.h b/include/linux/security.h
index 354b0ce..b206795 100644
--- 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)
{ }