diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2009-12-25 05:07:33 -0500 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2010-02-08 14:38:36 -0500 |
commit | cccc6bba3f771ef29b33e4f79e70ebc3dba245b0 (patch) | |
tree | 0abfed21a68d0ae54217a6f4308046fd30a70186 /include/linux/audit.h | |
parent | 123df2944c436c80640c4281c5bc9c7950b18687 (diff) |
Lose the first argument of audit_inode_child()
it's always equal to ->d_name.name of the second argument
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'include/linux/audit.h')
-rw-r--r-- | include/linux/audit.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/include/linux/audit.h b/include/linux/audit.h index 3c7a358241a7..f391d45c8aea 100644 --- a/include/linux/audit.h +++ b/include/linux/audit.h | |||
@@ -424,7 +424,7 @@ extern void audit_syscall_exit(int failed, long return_code); | |||
424 | extern void __audit_getname(const char *name); | 424 | extern void __audit_getname(const char *name); |
425 | extern void audit_putname(const char *name); | 425 | extern void audit_putname(const char *name); |
426 | extern void __audit_inode(const char *name, const struct dentry *dentry); | 426 | extern void __audit_inode(const char *name, const struct dentry *dentry); |
427 | extern void __audit_inode_child(const char *dname, const struct dentry *dentry, | 427 | extern void __audit_inode_child(const struct dentry *dentry, |
428 | const struct inode *parent); | 428 | const struct inode *parent); |
429 | extern void __audit_ptrace(struct task_struct *t); | 429 | extern void __audit_ptrace(struct task_struct *t); |
430 | 430 | ||
@@ -442,11 +442,10 @@ static inline void audit_inode(const char *name, const struct dentry *dentry) { | |||
442 | if (unlikely(!audit_dummy_context())) | 442 | if (unlikely(!audit_dummy_context())) |
443 | __audit_inode(name, dentry); | 443 | __audit_inode(name, dentry); |
444 | } | 444 | } |
445 | static inline void audit_inode_child(const char *dname, | 445 | static inline void audit_inode_child(const struct dentry *dentry, |
446 | const struct dentry *dentry, | ||
447 | const struct inode *parent) { | 446 | const struct inode *parent) { |
448 | if (unlikely(!audit_dummy_context())) | 447 | if (unlikely(!audit_dummy_context())) |
449 | __audit_inode_child(dname, dentry, parent); | 448 | __audit_inode_child(dentry, parent); |
450 | } | 449 | } |
451 | void audit_core_dumps(long signr); | 450 | void audit_core_dumps(long signr); |
452 | 451 | ||
@@ -544,9 +543,9 @@ extern int audit_signals; | |||
544 | #define audit_getname(n) do { ; } while (0) | 543 | #define audit_getname(n) do { ; } while (0) |
545 | #define audit_putname(n) do { ; } while (0) | 544 | #define audit_putname(n) do { ; } while (0) |
546 | #define __audit_inode(n,d) do { ; } while (0) | 545 | #define __audit_inode(n,d) do { ; } while (0) |
547 | #define __audit_inode_child(d,i,p) do { ; } while (0) | 546 | #define __audit_inode_child(i,p) do { ; } while (0) |
548 | #define audit_inode(n,d) do { ; } while (0) | 547 | #define audit_inode(n,d) do { ; } while (0) |
549 | #define audit_inode_child(d,i,p) do { ; } while (0) | 548 | #define audit_inode_child(i,p) do { ; } while (0) |
550 | #define audit_core_dumps(i) do { ; } while (0) | 549 | #define audit_core_dumps(i) do { ; } while (0) |
551 | #define auditsc_get_stamp(c,t,s) (0) | 550 | #define auditsc_get_stamp(c,t,s) (0) |
552 | #define audit_get_loginuid(t) (-1) | 551 | #define audit_get_loginuid(t) (-1) |