make the conditional a static inline instead of doing it in generic code.
Unified · Split
| @@ -417,7 +417,7 @@ extern int audit_classify_arch(int arch); · 416 unmodified lines | ||
| 417 | 417 | /* Public API */ |
| 418 | 418 | extern void audit_finish_fork(struct task_struct *child); |
| 419 | 419 | 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); | |
| 421 | 421 | extern void __audit_syscall_entry(int arch, |
| 422 | 422 | int major, unsigned long a0, unsigned long a1, |
| 423 | 423 | unsigned long a2, unsigned long a3); |
| @@ -435,6 +435,11 @@ static inline int audit_dummy_context(void) · 11 unmodified lines | ||
| 435 | 435 | void *p = current->audit_context; |
| 436 | 436 | return !p || *(int *)p; |
| 437 | 437 | } |
| 438 | +static inline void audit_free(struct task_struct *task) | |
| 439 | +{ | |
| 440 | + if (unlikely(task->audit_context)) | |
| 441 | + __audit_free(task); | |
| 442 | +} | |
| 438 | 443 | static inline void audit_syscall_entry(int arch, int major, unsigned long a0, |
| 439 | 444 | unsigned long a1, unsigned long a2, |
| 440 | 445 | unsigned long a3) |
| @@ -1594,7 +1594,7 @@ static void audit_log_exit(struct audit_context *context, struct task_struct *ts · 1593 unmodified lines | ||
| 1594 | 1594 | * |
| 1595 | 1595 | * Called from copy_process and do_exit |
| 1596 | 1596 | */ |
| 1597 | −void audit_free(struct task_struct *tsk) | |
| 1597 | +void __audit_free(struct task_struct *tsk) | |
| 1598 | 1598 | { |
| 1599 | 1599 | struct audit_context *context; |
| 1600 | 1600 | |
| @@ -964,8 +964,7 @@ NORET_TYPE void do_exit(long code) · 963 unmodified lines | ||
| 964 | 964 | acct_collect(code, group_dead); |
| 965 | 965 | if (group_dead) |
| 966 | 966 | tty_audit_exit(); |
| 967 | − if (unlikely(tsk->audit_context)) | |
| 968 | − audit_free(tsk); | |
| 967 | + audit_free(tsk); | |
| 969 | 968 | |
| 970 | 969 | tsk->exit_code = code; |
| 971 | 970 | taskstats_exit(tsk, group_dead); |