diff options
| author | James Morris <james.l.morris@oracle.com> | 2012-03-15 14:43:02 +1100 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2012-03-15 14:43:02 +1100 |
| commit | b01d3fb921df9baef1ecd13704f4b1e269b58b6b (patch) | |
| tree | 1ca714b40774cd56c0194abee5c6577b2ba6aad2 /security/apparmor/include/path.h | |
| parent | 6041e8346f2165679c2184cab60db768d6a26a1d (diff) | |
| parent | 2d4cee7e3a2b9f9c3237672cc136e20dbad0e2ce (diff) | |
| download | linux-b01d3fb921df9baef1ecd13704f4b1e269b58b6b.tar.bz2 | |
Merge branch 'for-security' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor into next
Diffstat (limited to 'security/apparmor/include/path.h')
| -rw-r--r-- | security/apparmor/include/path.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/security/apparmor/include/path.h b/security/apparmor/include/path.h index 27b327a7fae5..286ac75dc88b 100644 --- a/security/apparmor/include/path.h +++ b/security/apparmor/include/path.h @@ -26,6 +26,7 @@ enum path_flags { PATH_MEDIATE_DELETED = 0x10000, /* mediate deleted paths */ }; -int aa_get_name(struct path *path, int flags, char **buffer, const char **name); +int aa_path_name(struct path *path, int flags, char **buffer, + const char **name, const char **info); #endif /* __AA_PATH_H */ |