projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'nios2-v4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2
[deliverable/linux.git]
/
security
/
apparmor
/
include
/
file.h
diff --git
a/security/apparmor/include/file.h
b/security/apparmor/include/file.h
index 2c922b86bd44f5ba7e4b519df43c663b21c34ad3..4803c97d19924c9923a66d5c1a22ccb7ccd3d224 100644
(file)
--- a/
security/apparmor/include/file.h
+++ b/
security/apparmor/include/file.h
@@
-171,11
+171,11
@@
unsigned int aa_str_perms(struct aa_dfa *dfa, unsigned int start,
const char *name, struct path_cond *cond,
struct file_perms *perms);
const char *name, struct path_cond *cond,
struct file_perms *perms);
-int aa_path_perm(int op, struct aa_profile *profile, struct path *path,
+int aa_path_perm(int op, struct aa_profile *profile,
const
struct path *path,
int flags, u32 request, struct path_cond *cond);
int aa_path_link(struct aa_profile *profile, struct dentry *old_dentry,
int flags, u32 request, struct path_cond *cond);
int aa_path_link(struct aa_profile *profile, struct dentry *old_dentry,
- struct path *new_dir, struct dentry *new_dentry);
+
const
struct path *new_dir, struct dentry *new_dentry);
int aa_file_perm(int op, struct aa_profile *profile, struct file *file,
u32 request);
int aa_file_perm(int op, struct aa_profile *profile, struct file *file,
u32 request);
This page took
0.031451 seconds
and
5
git commands to generate.