diff options
author | Jan Blunck <jblunck@suse.de> | 2008-02-14 22:38:33 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-15 00:17:08 -0500 |
commit | 44707fdf5938ad269ea5d6c5744d82f6a7328746 (patch) | |
tree | 7eb1704418eb41b859ad24bc48f6400135474d87 /security/selinux/include | |
parent | a03a8a709a0c34b61b7aea1d54a0473a6b941fdb (diff) |
d_path: Use struct path in struct avc_audit_data
audit_log_d_path() is a d_path() wrapper that is used by the audit code. To
use a struct path in audit_log_d_path() I need to embed it into struct
avc_audit_data.
[akpm@linux-foundation.org: coding-style fixes]
Signed-off-by: Jan Blunck <jblunck@suse.de>
Acked-by: Christoph Hellwig <hch@infradead.org>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: "J. Bruce Fields" <bfields@fieldses.org>
Cc: Neil Brown <neilb@suse.de>
Cc: Stephen Smalley <sds@tycho.nsa.gov>
Cc: James Morris <jmorris@namei.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'security/selinux/include')
-rw-r--r-- | security/selinux/include/avc.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/security/selinux/include/avc.h b/security/selinux/include/avc.h index 80c28fa6621c..8e23d7a873a4 100644 --- a/security/selinux/include/avc.h +++ b/security/selinux/include/avc.h | |||
@@ -13,6 +13,7 @@ | |||
13 | #include <linux/spinlock.h> | 13 | #include <linux/spinlock.h> |
14 | #include <linux/init.h> | 14 | #include <linux/init.h> |
15 | #include <linux/in6.h> | 15 | #include <linux/in6.h> |
16 | #include <linux/path.h> | ||
16 | #include <asm/system.h> | 17 | #include <asm/system.h> |
17 | #include "flask.h" | 18 | #include "flask.h" |
18 | #include "av_permissions.h" | 19 | #include "av_permissions.h" |
@@ -30,8 +31,6 @@ extern int selinux_enforcing; | |||
30 | struct avc_entry; | 31 | struct avc_entry; |
31 | 32 | ||
32 | struct task_struct; | 33 | struct task_struct; |
33 | struct vfsmount; | ||
34 | struct dentry; | ||
35 | struct inode; | 34 | struct inode; |
36 | struct sock; | 35 | struct sock; |
37 | struct sk_buff; | 36 | struct sk_buff; |
@@ -46,8 +45,7 @@ struct avc_audit_data { | |||
46 | struct task_struct *tsk; | 45 | struct task_struct *tsk; |
47 | union { | 46 | union { |
48 | struct { | 47 | struct { |
49 | struct vfsmount *mnt; | 48 | struct path path; |
50 | struct dentry *dentry; | ||
51 | struct inode *inode; | 49 | struct inode *inode; |
52 | } fs; | 50 | } fs; |
53 | struct { | 51 | struct { |