diff --git a/[refs] b/[refs] index 8fee6c410fb2..44f8f14d1bc0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b5a7174875ea570cc675f2c503e800db8efdd6a7 +refs/heads/master: 7d1e13505be8c2bd2207894f4e0f069e1f9b51c9 diff --git a/trunk/kernel/acct.c b/trunk/kernel/acct.c index 7fc9f9dd1e9e..0feba97e114e 100644 --- a/trunk/kernel/acct.c +++ b/trunk/kernel/acct.c @@ -631,15 +631,9 @@ void acct_collect(long exitcode, int group_dead) spin_unlock_irq(¤t->sighand->siglock); } -/** - * acct_process - now just a wrapper around do_acct_process - * - * handles process accounting for an exiting task - */ -void acct_process(void) +static void acct_process_in_ns(struct pid_namespace *ns) { struct file *file = NULL; - struct pid_namespace *ns = task_active_pid_ns(current); struct bsd_acct_struct *acct; acct = ns->bacct; @@ -661,3 +655,16 @@ void acct_process(void) do_acct_process(acct, ns, file); fput(file); } + +/** + * acct_process - now just a wrapper around do_acct_process + * + * handles process accounting for an exiting task + */ +void acct_process(void) +{ + struct pid_namespace *ns; + + for (ns = task_active_pid_ns(current); ns != NULL; ns = ns->parent) + acct_process_in_ns(ns); +}