Commit 7d1e1350 authored by Pavel Emelyanov's avatar Pavel Emelyanov Committed by Linus Torvalds
Browse files

bsdacct: account dying tasks in all relevant namespaces



This just makes the acct_proces walk the pid namespaces from current up to
the top and account a task in each with the accounting turned on.

ns->parent access if safe lockless, since current it still alive and holds
its namespace, which in turn holds its parent.

Signed-off-by: default avatarPavel Emelyanov <xemul@openvz.org>
Cc: Balbir Singh <balbir@in.ibm.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent b5a71748
Loading
Loading
Loading
Loading
+14 −7
Original line number Diff line number Diff line
@@ -631,15 +631,9 @@ void acct_collect(long exitcode, int group_dead)
	spin_unlock_irq(&current->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);
}