aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/security.h
diff options
context:
space:
mode:
authorEric Paris <eparis@redhat.com>2010-04-07 15:14:21 -0400
committerJames Morris <jmorris@namei.org>2010-04-11 22:18:29 -0400
commit231923bd0e06cba69f7c2028f4a68602b8d22160 (patch)
tree91e3864e87f3de86de8ad0ed55a829cbdf797545 /include/linux/security.h
parent353633100d8d684ac0acae4ce93fb833f92881f4 (diff)
security: remove dead hook sb_umount_close
Unused hook. Remove. Signed-off-by: Eric Paris <eparis@redhat.com> Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'include/linux/security.h')
-rw-r--r--include/linux/security.h10
1 files changed, 0 insertions, 10 deletions
diff --git a/include/linux/security.h b/include/linux/security.h
index 9ebd2e411d2d..354b0ceefc87 100644
--- a/include/linux/security.h
+++ b/include/linux/security.h
@@ -272,11 +272,6 @@ static inline void security_free_mnt_opts(struct security_mnt_opts *opts)
272 * @mnt contains the mounted file system. 272 * @mnt contains the mounted file system.
273 * @flags contains the unmount flags, e.g. MNT_FORCE. 273 * @flags contains the unmount flags, e.g. MNT_FORCE.
274 * Return 0 if permission is granted. 274 * Return 0 if permission is granted.
275 * @sb_umount_close:
276 * Close any files in the @mnt mounted filesystem that are held open by
277 * the security module. This hook is called during an umount operation
278 * prior to checking whether the filesystem is still busy.
279 * @mnt contains the mounted filesystem.
280 * @sb_umount_busy: 275 * @sb_umount_busy:
281 * Handle a failed umount of the @mnt mounted filesystem, e.g. re-opening 276 * Handle a failed umount of the @mnt mounted filesystem, e.g. re-opening
282 * any files that were closed by umount_close. This hook is called during 277 * any files that were closed by umount_close. This hook is called during
@@ -1479,7 +1474,6 @@ struct security_operations {
1479 int (*sb_mount) (char *dev_name, struct path *path, 1474 int (*sb_mount) (char *dev_name, struct path *path,
1480 char *type, unsigned long flags, void *data); 1475 char *type, unsigned long flags, void *data);
1481 int (*sb_umount) (struct vfsmount *mnt, int flags); 1476 int (*sb_umount) (struct vfsmount *mnt, int flags);
1482 void (*sb_umount_close) (struct vfsmount *mnt);
1483 void (*sb_umount_busy) (struct vfsmount *mnt); 1477 void (*sb_umount_busy) (struct vfsmount *mnt);
1484 void (*sb_post_remount) (struct vfsmount *mnt, 1478 void (*sb_post_remount) (struct vfsmount *mnt,
1485 unsigned long flags, void *data); 1479 unsigned long flags, void *data);
@@ -1777,7 +1771,6 @@ int security_sb_statfs(struct dentry *dentry);
1777int security_sb_mount(char *dev_name, struct path *path, 1771int security_sb_mount(char *dev_name, struct path *path,
1778 char *type, unsigned long flags, void *data); 1772 char *type, unsigned long flags, void *data);
1779int security_sb_umount(struct vfsmount *mnt, int flags); 1773int security_sb_umount(struct vfsmount *mnt, int flags);
1780void security_sb_umount_close(struct vfsmount *mnt);
1781void security_sb_umount_busy(struct vfsmount *mnt); 1774void security_sb_umount_busy(struct vfsmount *mnt);
1782void security_sb_post_remount(struct vfsmount *mnt, unsigned long flags, void *data); 1775void security_sb_post_remount(struct vfsmount *mnt, unsigned long flags, void *data);
1783void security_sb_post_addmount(struct vfsmount *mnt, struct path *mountpoint); 1776void security_sb_post_addmount(struct vfsmount *mnt, struct path *mountpoint);
@@ -2096,9 +2089,6 @@ static inline int security_sb_umount(struct vfsmount *mnt, int flags)
2096 return 0; 2089 return 0;
2097} 2090}
2098 2091
2099static inline void security_sb_umount_close(struct vfsmount *mnt)
2100{ }
2101
2102static inline void security_sb_umount_busy(struct vfsmount *mnt) 2092static inline void security_sb_umount_busy(struct vfsmount *mnt)
2103{ } 2093{ }
2104 2094