[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <4A56FF33.2080508@ct.jp.nec.com>
Date: Fri, 10 Jul 2009 17:43:31 +0900
From: Hiroshi Shimamoto <h-shimamoto@...jp.nec.com>
To: linux-kernel@...r.kernel.org
Subject: [RFC 2/2] make binfmt module get and put per signal_struct
From: Hiroshi Shimamoto <h-shimamoto@...jp.nec.com>
The binfmt is a member of signal_struct, so it can be handled per
signal_struct instead of task_struct.
Signed-off-by: Hiroshi Shimamoto <h-shimamoto@...jp.nec.com>
---
kernel/exit.c | 2 --
kernel/fork.c | 12 ++++++------
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/kernel/exit.c b/kernel/exit.c
index 708348a..187a211 100644
--- a/kernel/exit.c
+++ b/kernel/exit.c
@@ -971,8 +971,6 @@ NORET_TYPE void do_exit(long code)
disassociate_ctty(1);
module_put(task_thread_info(tsk)->exec_domain->module);
- if (tsk->signal->binfmt)
- module_put(tsk->signal->binfmt->module);
proc_exit_connector(tsk);
diff --git a/kernel/fork.c b/kernel/fork.c
index dfb9d0a..636c06f 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -848,6 +848,10 @@ static int copy_signal(unsigned long clone_flags, struct task_struct *tsk)
sig->tty_old_pgrp = NULL;
sig->tty = NULL;
sig->binfmt = current->signal->binfmt;
+ if (sig->binfmt && !try_module_get(sig->binfmt->module)) {
+ kmem_cache_free(signal_cachep, sig);
+ return -EAGAIN;
+ }
sig->utime = sig->stime = sig->cutime = sig->cstime = cputime_zero;
sig->gtime = cputime_zero;
@@ -876,6 +880,8 @@ void __cleanup_signal(struct signal_struct *sig)
{
thread_group_cputime_free(sig);
tty_kref_put(sig->tty);
+ if (sig->binfmt)
+ module_put(sig->binfmt->module);
kmem_cache_free(signal_cachep, sig);
}
@@ -1015,9 +1021,6 @@ static struct task_struct *copy_process(unsigned long clone_flags,
if (!try_module_get(task_thread_info(p)->exec_domain->module))
goto bad_fork_cleanup_count;
- if (p->signal->binfmt && !try_module_get(p->signal->binfmt->module))
- goto bad_fork_cleanup_put_domain;
-
p->did_exec = 0;
delayacct_tsk_init(p); /* Must remain after dup_task_struct() */
copy_flags(clone_flags, p);
@@ -1302,9 +1305,6 @@ bad_fork_cleanup_cgroup:
#endif
cgroup_exit(p, cgroup_callbacks_done);
delayacct_tsk_free(p);
- if (p->signal->binfmt)
- module_put(p->signal->binfmt->module);
-bad_fork_cleanup_put_domain:
module_put(task_thread_info(p)->exec_domain->module);
bad_fork_cleanup_count:
atomic_dec(&p->cred->user->processes);
--
1.6.2.5
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists