diff options
author | Eric Paris <eparis@redhat.com> | 2010-04-07 15:14:33 -0400 |
---|---|---|
committer | James Morris <jmorris@namei.org> | 2010-04-11 22:18:30 -0400 |
commit | 82dab10453d65ad9ca551de5b8925673ca05c7e9 (patch) | |
tree | 942bf24adb67b534fa3080dbbfa1ffe33b7c16bd /include/linux/security.h | |
parent | 4b61d12c84293ac061909f27f567c1905e4d90e3 (diff) |
security: remove dead hook sb_post_remount
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.h | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/include/linux/security.h b/include/linux/security.h index b206795c09f7..338617a50fa3 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_post_remount: | ||
276 | * Update the security module's state when a filesystem is remounted. | ||
277 | * This hook is only called if the remount was successful. | ||
278 | * @mnt contains the mounted file system. | ||
279 | * @flags contains the new filesystem flags. | ||
280 | * @data contains the filesystem-specific data. | ||
281 | * @sb_post_addmount: | 275 | * @sb_post_addmount: |
282 | * Update the security module's state when a filesystem is mounted. | 276 | * Update the security module's state when a filesystem is mounted. |
283 | * This hook is called any time a mount is successfully grafetd to | 277 | * This hook is called any time a mount is successfully grafetd to |
@@ -1468,8 +1462,6 @@ struct security_operations { | |||
1468 | int (*sb_mount) (char *dev_name, struct path *path, | 1462 | int (*sb_mount) (char *dev_name, struct path *path, |
1469 | char *type, unsigned long flags, void *data); | 1463 | char *type, unsigned long flags, void *data); |
1470 | int (*sb_umount) (struct vfsmount *mnt, int flags); | 1464 | int (*sb_umount) (struct vfsmount *mnt, int flags); |
1471 | void (*sb_post_remount) (struct vfsmount *mnt, | ||
1472 | unsigned long flags, void *data); | ||
1473 | void (*sb_post_addmount) (struct vfsmount *mnt, | 1465 | void (*sb_post_addmount) (struct vfsmount *mnt, |
1474 | struct path *mountpoint); | 1466 | struct path *mountpoint); |
1475 | int (*sb_pivotroot) (struct path *old_path, | 1467 | int (*sb_pivotroot) (struct path *old_path, |
@@ -1764,7 +1756,6 @@ int security_sb_statfs(struct dentry *dentry); | |||
1764 | int security_sb_mount(char *dev_name, struct path *path, | 1756 | int security_sb_mount(char *dev_name, struct path *path, |
1765 | char *type, unsigned long flags, void *data); | 1757 | char *type, unsigned long flags, void *data); |
1766 | int security_sb_umount(struct vfsmount *mnt, int flags); | 1758 | int security_sb_umount(struct vfsmount *mnt, int flags); |
1767 | void security_sb_post_remount(struct vfsmount *mnt, unsigned long flags, void *data); | ||
1768 | void security_sb_post_addmount(struct vfsmount *mnt, struct path *mountpoint); | 1759 | void security_sb_post_addmount(struct vfsmount *mnt, struct path *mountpoint); |
1769 | int security_sb_pivotroot(struct path *old_path, struct path *new_path); | 1760 | int security_sb_pivotroot(struct path *old_path, struct path *new_path); |
1770 | void security_sb_post_pivotroot(struct path *old_path, struct path *new_path); | 1761 | void security_sb_post_pivotroot(struct path *old_path, struct path *new_path); |
@@ -2081,10 +2072,6 @@ static inline int security_sb_umount(struct vfsmount *mnt, int flags) | |||
2081 | return 0; | 2072 | return 0; |
2082 | } | 2073 | } |
2083 | 2074 | ||
2084 | static inline void security_sb_post_remount(struct vfsmount *mnt, | ||
2085 | unsigned long flags, void *data) | ||
2086 | { } | ||
2087 | |||
2088 | static inline void security_sb_post_addmount(struct vfsmount *mnt, | 2075 | static inline void security_sb_post_addmount(struct vfsmount *mnt, |
2089 | struct path *mountpoint) | 2076 | struct path *mountpoint) |
2090 | { } | 2077 | { } |