aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/security.h
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 /include/linux/security.h
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 'include/linux/security.h')
-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 354b0ceefc87..b206795c09f7 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)
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_busy:
276 * Handle a failed umount of the @mnt mounted filesystem, e.g. re-opening
277 * any files that were closed by umount_close. This hook is called during
278 * an umount operation if the umount fails after a call to the
279 * umount_close hook.
280 * @mnt contains the mounted filesystem.
281 * @sb_post_remount: 275 * @sb_post_remount:
282 * Update the security module's state when a filesystem is remounted. 276 * Update the security module's state when a filesystem is remounted.
283 * This hook is only called if the remount was successful. 277 * This hook is only called if the remount was successful.
@@ -1474,7 +1468,6 @@ struct security_operations {
1474 int (*sb_mount) (char *dev_name, struct path *path, 1468 int (*sb_mount) (char *dev_name, struct path *path,
1475 char *type, unsigned long flags, void *data); 1469 char *type, unsigned long flags, void *data);
1476 int (*sb_umount) (struct vfsmount *mnt, int flags); 1470 int (*sb_umount) (struct vfsmount *mnt, int flags);
1477 void (*sb_umount_busy) (struct vfsmount *mnt);
1478 void (*sb_post_remount) (struct vfsmount *mnt, 1471 void (*sb_post_remount) (struct vfsmount *mnt,
1479 unsigned long flags, void *data); 1472 unsigned long flags, void *data);
1480 void (*sb_post_addmount) (struct vfsmount *mnt, 1473 void (*sb_post_addmount) (struct vfsmount *mnt,
@@ -1771,7 +1764,6 @@ int security_sb_statfs(struct dentry *dentry);
1771int security_sb_mount(char *dev_name, struct path *path, 1764int security_sb_mount(char *dev_name, struct path *path,
1772 char *type, unsigned long flags, void *data); 1765 char *type, unsigned long flags, void *data);
1773int security_sb_umount(struct vfsmount *mnt, int flags); 1766int security_sb_umount(struct vfsmount *mnt, int flags);
1774void security_sb_umount_busy(struct vfsmount *mnt);
1775void security_sb_post_remount(struct vfsmount *mnt, unsigned long flags, void *data); 1767void security_sb_post_remount(struct vfsmount *mnt, unsigned long flags, void *data);
1776void security_sb_post_addmount(struct vfsmount *mnt, struct path *mountpoint); 1768void security_sb_post_addmount(struct vfsmount *mnt, struct path *mountpoint);
1777int security_sb_pivotroot(struct path *old_path, struct path *new_path); 1769int 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)
2089 return 0; 2081 return 0;
2090} 2082}
2091 2083
2092static inline void security_sb_umount_busy(struct vfsmount *mnt)
2093{ }
2094
2095static inline void security_sb_post_remount(struct vfsmount *mnt, 2084static inline void security_sb_post_remount(struct vfsmount *mnt,
2096 unsigned long flags, void *data) 2085 unsigned long flags, void *data)
2097{ } 2086{ }