diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-24 08:31:04 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-24 08:31:04 -0700 |
| commit | 6d39b27f0ac7e805ae3bd9efa51d7da04bec0360 (patch) | |
| tree | 21a9cd29a07dd1afe70fe88f1343a0fa0fb0ed26 /kernel/audit_watch.c | |
| parent | a487b6705a811087c182c8cab7e3b5845dfa6ccb (diff) | |
| parent | d81165919ebf6e1cb9eeb612150f9287ad414659 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current
* git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current:
lsm: Use a compressed IPv6 string format in audit events
Audit: send signal info if selinux is disabled
Audit: rearrange audit_context to save 16 bytes per struct
Audit: reorganize struct audit_watch to save 8 bytes
Diffstat (limited to 'kernel/audit_watch.c')
| -rw-r--r-- | kernel/audit_watch.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/audit_watch.c b/kernel/audit_watch.c index 0e96dbc60ea..cc7e87936cb 100644 --- a/kernel/audit_watch.c +++ b/kernel/audit_watch.c @@ -45,8 +45,8 @@ struct audit_watch { atomic_t count; /* reference count */ - char *path; /* insertion path */ dev_t dev; /* associated superblock device */ + char *path; /* insertion path */ unsigned long ino; /* associated inode number */ struct audit_parent *parent; /* associated parent */ struct list_head wlist; /* entry in parent->watches list */ |