coredump: turn mm->core_startup_done into the pointer to struct core_state

mm->core_startup_done points to "struct completion startup_done" allocated
on the coredump_wait()'s stack.  Introduce the new structure, core_state,
which holds this "struct completion".  This way we can add more info
visible to the threads participating in coredump without enlarging
mm_struct.

No changes in affected .o files.

Signed-off-by: Oleg Nesterov <oleg@tv-sign.ru>
Cc: Roland McGrath <roland@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Oleg Nesterov 2008-07-25 01:47:41 -07:00 committed by Linus Torvalds
parent 24d5288f06
commit 32ecb1f26d
3 changed files with 11 additions and 6 deletions

View File

@ -1597,13 +1597,13 @@ static int coredump_wait(int exit_code)
{ {
struct task_struct *tsk = current; struct task_struct *tsk = current;
struct mm_struct *mm = tsk->mm; struct mm_struct *mm = tsk->mm;
struct completion startup_done; struct core_state core_state;
struct completion *vfork_done; struct completion *vfork_done;
int core_waiters; int core_waiters;
init_completion(&mm->core_done); init_completion(&mm->core_done);
init_completion(&startup_done); init_completion(&core_state.startup);
mm->core_startup_done = &startup_done; mm->core_state = &core_state;
core_waiters = zap_threads(tsk, mm, exit_code); core_waiters = zap_threads(tsk, mm, exit_code);
up_write(&mm->mmap_sem); up_write(&mm->mmap_sem);
@ -1622,7 +1622,7 @@ static int coredump_wait(int exit_code)
} }
if (core_waiters) if (core_waiters)
wait_for_completion(&startup_done); wait_for_completion(&core_state.startup);
fail: fail:
BUG_ON(mm->core_waiters); BUG_ON(mm->core_waiters);
return core_waiters; return core_waiters;

View File

@ -159,6 +159,10 @@ struct vm_area_struct {
#endif #endif
}; };
struct core_state {
struct completion startup;
};
struct mm_struct { struct mm_struct {
struct vm_area_struct * mmap; /* list of VMAs */ struct vm_area_struct * mmap; /* list of VMAs */
struct rb_root mm_rb; struct rb_root mm_rb;
@ -220,7 +224,8 @@ struct mm_struct {
unsigned long flags; /* Must use atomic bitops to access the bits */ unsigned long flags; /* Must use atomic bitops to access the bits */
/* coredumping support */ /* coredumping support */
struct completion *core_startup_done, core_done; struct core_state *core_state;
struct completion core_done;
/* aio bits */ /* aio bits */
rwlock_t ioctx_list_lock; /* aio lock */ rwlock_t ioctx_list_lock; /* aio lock */

View File

@ -680,7 +680,7 @@ static void exit_mm(struct task_struct * tsk)
up_read(&mm->mmap_sem); up_read(&mm->mmap_sem);
down_write(&mm->mmap_sem); down_write(&mm->mmap_sem);
if (!--mm->core_waiters) if (!--mm->core_waiters)
complete(mm->core_startup_done); complete(&mm->core_state->startup);
up_write(&mm->mmap_sem); up_write(&mm->mmap_sem);
wait_for_completion(&mm->core_done); wait_for_completion(&mm->core_done);