History

audit: inline audit_free to simplify the look of generic code

make the conditional a static inline instead of doing it in generic code.

Eric Paris committed 14 years ago

Commit a4ff8db1 parent 38cdce53 files · +8 −4Browse files

Unified · Split

3 files
  1. include/linux/audit.h +6 −1
  2. kernel/auditsc.c +1 −1
  3. kernel/exit.c +1 −2
include/linux/audit.h+6−1
@@ -417,7 +417,7 @@ extern int audit_classify_arch(int arch); · 416 unmodified lines
417417 /* Public API */
418418 extern void audit_finish_fork(struct task_struct *child);
419419 extern int audit_alloc(struct task_struct *task);
420−extern void audit_free(struct task_struct *task);
420+extern void __audit_free(struct task_struct *task);
421421 extern void __audit_syscall_entry(int arch,
422422 int major, unsigned long a0, unsigned long a1,
423423 unsigned long a2, unsigned long a3);
@@ -435,6 +435,11 @@ static inline int audit_dummy_context(void) · 11 unmodified lines
435435 void *p = current->audit_context;
436436 return !p || *(int *)p;
437437 }
438+static inline void audit_free(struct task_struct *task)
439+{
440+ if (unlikely(task->audit_context))
441+ __audit_free(task);
442+}
438443 static inline void audit_syscall_entry(int arch, int major, unsigned long a0,
439444 unsigned long a1, unsigned long a2,
440445 unsigned long a3)
kernel/auditsc.c+1−1
@@ -1594,7 +1594,7 @@ static void audit_log_exit(struct audit_context *context, struct task_struct *ts · 1593 unmodified lines
15941594 *
15951595 * Called from copy_process and do_exit
15961596 */
1597−void audit_free(struct task_struct *tsk)
1597+void __audit_free(struct task_struct *tsk)
15981598 {
15991599 struct audit_context *context;
16001600
kernel/exit.c+1−2
@@ -964,8 +964,7 @@ NORET_TYPE void do_exit(long code) · 963 unmodified lines
964964 acct_collect(code, group_dead);
965965 if (group_dead)
966966 tty_audit_exit();
967− if (unlikely(tsk->audit_context))
968− audit_free(tsk);
967+ audit_free(tsk);
969968
970969 tsk->exit_code = code;
971970 taskstats_exit(tsk, group_dead);

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t