Messages in this thread Patch in this message | | | Date | Mon, 7 Dec 2009 20:45:14 +0100 | From | Veaceslav Falico <> | Subject | [PATCH] kill taskstats_tgid_init() and acct_init_pacct() and cleanup copy_signal() |
| |
(on top of previous patchset)
Kill taskstats_tgid_init() and acct_init_pacct() because we don't need them any more. Cleanup copy_signal() from these functions and remove the call to task_io_accounting_init() (we can't kill it because it's still being used by copy_process(), so just removing it from copy_signal()).
Signed-off-by: Veaceslav Falico <vfalico@redhat.com> ---
--- a/include/linux/taskstats_kern.h 2009-12-07 20:20:02.000000000 +0100 +++ b/include/linux/taskstats_kern.h 2009-12-07 20:20:48.000000000 +0100 @@ -14,10 +14,6 @@ extern struct kmem_cache *taskstats_cache; extern struct mutex taskstats_exit_mutex; -static inline void taskstats_tgid_init(struct signal_struct *sig) -{ -} - static inline void taskstats_tgid_free(struct signal_struct *sig) { if (sig->stats) @@ -29,8 +25,6 @@ extern void taskstats_init_early(void); #else static inline void taskstats_exit(struct task_struct *tsk, int group_dead) {} -static inline void taskstats_tgid_init(struct signal_struct *sig) -{} static inline void taskstats_tgid_free(struct signal_struct *sig) {} static inline void taskstats_init_early(void) --- a/kernel/acct.c 2009-12-07 20:23:43.000000000 +0100 +++ b/kernel/acct.c 2009-12-07 20:24:30.000000000 +0100 @@ -587,14 +587,6 @@ out: } /** - * acct_init_pacct - initialize a new pacct_struct - * @pacct: per-process accounting info struct to initialize - */ -void acct_init_pacct(struct pacct_struct *pacct) -{ -} - -/** * acct_collect - collect accounting information into pacct_struct * @exitcode: task exit code * @group_dead: not 0, if this thread is the last one in the process. --- a/include/linux/acct.h 2009-12-07 20:26:35.000000000 +0100 +++ b/include/linux/acct.h 2009-12-07 20:26:43.000000000 +0100 @@ -123,14 +123,12 @@ struct pacct_struct; struct pid_namespace; extern void acct_auto_close_mnt(struct vfsmount *m); extern void acct_auto_close(struct super_block *sb); -extern void acct_init_pacct(struct pacct_struct *pacct); extern void acct_collect(long exitcode, int group_dead); extern void acct_process(void); extern void acct_exit_ns(struct pid_namespace *); #else #define acct_auto_close_mnt(x) do { } while (0) #define acct_auto_close(x) do { } while (0) -#define acct_init_pacct(x) do { } while (0) #define acct_collect(x,y) do { } while (0) #define acct_process() do { } while (0) #define acct_exit_ns(ns) do { } while (0) --- a/kernel/fork.c 2009-12-07 20:25:18.000000000 +0100 +++ b/kernel/fork.c 2009-12-07 20:36:49.000000000 +0100 @@ -861,17 +861,12 @@ static int copy_signal(unsigned long clo hrtimer_init(&sig->real_timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL); sig->real_timer.function = it_real_fn; - task_io_accounting_init(&sig->ioac); - taskstats_tgid_init(sig); - task_lock(current->group_leader); memcpy(sig->rlim, current->signal->rlim, sizeof sig->rlim); task_unlock(current->group_leader); posix_cpu_timers_init_group(sig); - acct_init_pacct(&sig->pacct); - tty_audit_fork(sig); sig->oom_adj = current->signal->oom_adj;
| |