aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorEric Paris <eparis@redhat.com>2010-04-07 15:14:45 -0400
committerJames Morris <jmorris@namei.org>2010-04-11 22:18:32 -0400
commit91a9420f5826db482030c21eca8c507271bbc441 (patch)
treee5e400622884c8c0cd373c51ee4a3822c853aaa5 /include
parent3db291017753e539af64c8bab373785f34e43ed2 (diff)
security: remove dead hook sb_post_pivotroot
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 a42d733086a1..4de5bbb39052 100644
--- a/include/linux/security.h
+++ b/include/linux/security.h
@@ -277,10 +277,6 @@ static inline void security_free_mnt_opts(struct security_mnt_opts *opts)
277 * @old_path contains the path for the new location of the current root (put_old). 277 * @old_path contains the path for the new location of the current root (put_old).
278 * @new_path contains the path for the new root (new_root). 278 * @new_path contains the path for the new root (new_root).
279 * Return 0 if permission is granted. 279 * Return 0 if permission is granted.
280 * @sb_post_pivotroot:
281 * Update module state after a successful pivot.
282 * @old_path contains the path for the old root.
283 * @new_path contains the path for the new root.
284 * @sb_set_mnt_opts: 280 * @sb_set_mnt_opts:
285 * Set the security relevant mount options used for a superblock 281 * Set the security relevant mount options used for a superblock
286 * @sb the superblock to set security mount options for 282 * @sb the superblock to set security mount options for
@@ -1458,8 +1454,6 @@ struct security_operations {
1458 int (*sb_umount) (struct vfsmount *mnt, int flags); 1454 int (*sb_umount) (struct vfsmount *mnt, int flags);
1459 int (*sb_pivotroot) (struct path *old_path, 1455 int (*sb_pivotroot) (struct path *old_path,
1460 struct path *new_path); 1456 struct path *new_path);
1461 void (*sb_post_pivotroot) (struct path *old_path,
1462 struct path *new_path);
1463 int (*sb_set_mnt_opts) (struct super_block *sb, 1457 int (*sb_set_mnt_opts) (struct super_block *sb,
1464 struct security_mnt_opts *opts); 1458 struct security_mnt_opts *opts);
1465 void (*sb_clone_mnt_opts) (const struct super_block *oldsb, 1459 void (*sb_clone_mnt_opts) (const struct super_block *oldsb,
@@ -1749,7 +1743,6 @@ int security_sb_mount(char *dev_name, struct path *path,
1749 char *type, unsigned long flags, void *data); 1743 char *type, unsigned long flags, void *data);
1750int security_sb_umount(struct vfsmount *mnt, int flags); 1744int security_sb_umount(struct vfsmount *mnt, int flags);
1751int security_sb_pivotroot(struct path *old_path, struct path *new_path); 1745int security_sb_pivotroot(struct path *old_path, struct path *new_path);
1752void security_sb_post_pivotroot(struct path *old_path, struct path *new_path);
1753int security_sb_set_mnt_opts(struct super_block *sb, struct security_mnt_opts *opts); 1746int security_sb_set_mnt_opts(struct super_block *sb, struct security_mnt_opts *opts);
1754void security_sb_clone_mnt_opts(const struct super_block *oldsb, 1747void security_sb_clone_mnt_opts(const struct super_block *oldsb,
1755 struct super_block *newsb); 1748 struct super_block *newsb);
@@ -2069,10 +2062,6 @@ static inline int security_sb_pivotroot(struct path *old_path,
2069 return 0; 2062 return 0;
2070} 2063}
2071 2064
2072static inline void security_sb_post_pivotroot(struct path *old_path,
2073 struct path *new_path)
2074{ }
2075
2076static inline int security_sb_set_mnt_opts(struct super_block *sb, 2065static inline int security_sb_set_mnt_opts(struct super_block *sb,
2077 struct security_mnt_opts *opts) 2066 struct security_mnt_opts *opts)
2078{ 2067{