aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/linux/security.h10
1 files changed, 6 insertions, 4 deletions
diff --git a/include/linux/security.h b/include/linux/security.h
index eee7478cda70..4c7058dc5514 100644
--- a/include/linux/security.h
+++ b/include/linux/security.h
@@ -1436,7 +1436,7 @@ struct security_operations {
1436 struct path *new_path); 1436 struct path *new_path);
1437 int (*sb_set_mnt_opts) (struct super_block *sb, 1437 int (*sb_set_mnt_opts) (struct super_block *sb,
1438 struct security_mnt_opts *opts); 1438 struct security_mnt_opts *opts);
1439 void (*sb_clone_mnt_opts) (const struct super_block *oldsb, 1439 int (*sb_clone_mnt_opts) (const struct super_block *oldsb,
1440 struct super_block *newsb); 1440 struct super_block *newsb);
1441 int (*sb_parse_opts_str) (char *options, struct security_mnt_opts *opts); 1441 int (*sb_parse_opts_str) (char *options, struct security_mnt_opts *opts);
1442 1442
@@ -1721,7 +1721,7 @@ int security_sb_mount(const char *dev_name, struct path *path,
1721int security_sb_umount(struct vfsmount *mnt, int flags); 1721int security_sb_umount(struct vfsmount *mnt, int flags);
1722int security_sb_pivotroot(struct path *old_path, struct path *new_path); 1722int security_sb_pivotroot(struct path *old_path, struct path *new_path);
1723int security_sb_set_mnt_opts(struct super_block *sb, struct security_mnt_opts *opts); 1723int security_sb_set_mnt_opts(struct super_block *sb, struct security_mnt_opts *opts);
1724void security_sb_clone_mnt_opts(const struct super_block *oldsb, 1724int security_sb_clone_mnt_opts(const struct super_block *oldsb,
1725 struct super_block *newsb); 1725 struct super_block *newsb);
1726int security_sb_parse_opts_str(char *options, struct security_mnt_opts *opts); 1726int security_sb_parse_opts_str(char *options, struct security_mnt_opts *opts);
1727 1727
@@ -2011,9 +2011,11 @@ static inline int security_sb_set_mnt_opts(struct super_block *sb,
2011 return 0; 2011 return 0;
2012} 2012}
2013 2013
2014static inline void security_sb_clone_mnt_opts(const struct super_block *oldsb, 2014static inline int security_sb_clone_mnt_opts(const struct super_block *oldsb,
2015 struct super_block *newsb) 2015 struct super_block *newsb)
2016{ } 2016{
2017 return 0;
2018}
2017 2019
2018static inline int security_sb_parse_opts_str(char *options, struct security_mnt_opts *opts) 2020static inline int security_sb_parse_opts_str(char *options, struct security_mnt_opts *opts)
2019{ 2021{