Merge tag 'apparmor-pr-2019-12-03' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-block.git] / security / apparmor / include / file.h

diff --git a/security/apparmor/include/file.h b/security/apparmor/include/file.h
index a852be89a7dcc2e086fb981c1f61de1b644925b9..aff26fc71407482ff5e6b973fc104580a24923a4 100644 (file)
--- a/security/apparmor/include/file.h
+++ b/security/apparmor/include/file.h
@@ -197,7 +197,7 @@ int aa_path_link(struct aa_label *label, struct dentry *old_dentry,
                 const struct path *new_dir, struct dentry *new_dentry);
 
 int aa_file_perm(const char *op, struct aa_label *label, struct file *file,
-                u32 request);
+                u32 request, bool in_atomic);
 
 void aa_inherit_files(const struct cred *cred, struct files_struct *files);