x86 PAT: fix mmap() of holes

[linux-2.6-block.git] / security / security.c

diff --git a/security/security.c b/security/security.c
index d15e56cbaadeea25c550cfc985de2dbbfbf410fa..9beecac933b467c3773f57e2b45cca1cf9edc472 100644 (file)
--- a/security/security.c
+++ b/security/security.c
@@ -57,7 +57,7 @@ int __init security_init(void)
 
        if (verify(&dummy_security_ops)) {
                printk(KERN_ERR "%s could not verify "
-                      "dummy_security_ops structure.\n", __FUNCTION__);
+                      "dummy_security_ops structure.\n", __func__);
                return -EIO;
        }
 
@@ -82,7 +82,7 @@ int register_security(struct security_operations *ops)
 {
        if (verify(ops)) {
                printk(KERN_DEBUG "%s could not verify "
-                      "security_operations structure.\n", __FUNCTION__);
+                      "security_operations structure.\n", __func__);
                return -EINVAL;
        }
 
@@ -110,13 +110,13 @@ int mod_reg_security(const char *name, struct security_operations *ops)
 {
        if (verify(ops)) {
                printk(KERN_INFO "%s could not verify "
-                      "security operations.\n", __FUNCTION__);
+                      "security operations.\n", __func__);
                return -EINVAL;
        }
 
        if (ops == security_ops) {
                printk(KERN_INFO "%s security operations "
-                      "already registered.\n", __FUNCTION__);
+                      "already registered.\n", __func__);
                return -EINVAL;
        }
 
@@ -244,10 +244,11 @@ void security_sb_free(struct super_block *sb)
        security_ops->sb_free_security(sb);
 }
 
-int security_sb_copy_data(struct file_system_type *type, void *orig, void *copy)
+int security_sb_copy_data(char *orig, char *copy)
 {
-       return security_ops->sb_copy_data(type, orig, copy);
+       return security_ops->sb_copy_data(orig, copy);
 }
+EXPORT_SYMBOL(security_sb_copy_data);
 
 int security_sb_kern_mount(struct super_block *sb, void *data)
 {
@@ -306,24 +307,30 @@ void security_sb_post_pivotroot(struct nameidata *old_nd, struct nameidata *new_
 }
 
 int security_sb_get_mnt_opts(const struct super_block *sb,
-                             char ***mount_options,
-                             int **flags, int *num_opts)
+                               struct security_mnt_opts *opts)
 {
-       return security_ops->sb_get_mnt_opts(sb, mount_options, flags, num_opts);
+       return security_ops->sb_get_mnt_opts(sb, opts);
 }
 
 int security_sb_set_mnt_opts(struct super_block *sb,
-                             char **mount_options,
-                             int *flags, int num_opts)
+                               struct security_mnt_opts *opts)
 {
-       return security_ops->sb_set_mnt_opts(sb, mount_options, flags, num_opts);
+       return security_ops->sb_set_mnt_opts(sb, opts);
 }
+EXPORT_SYMBOL(security_sb_set_mnt_opts);
 
 void security_sb_clone_mnt_opts(const struct super_block *oldsb,
                                struct super_block *newsb)
 {
        security_ops->sb_clone_mnt_opts(oldsb, newsb);
 }
+EXPORT_SYMBOL(security_sb_clone_mnt_opts);
+
+int security_sb_parse_opts_str(char *options, struct security_mnt_opts *opts)
+{
+       return security_ops->sb_parse_opts_str(options, opts);
+}
+EXPORT_SYMBOL(security_sb_parse_opts_str);
 
 int security_inode_alloc(struct inode *inode)
 {