Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 260415
b: refs/heads/master
c: fb0a685
h: refs/heads/master
i:
  260413: 48b6856
  260411: 6f807e0
  260407: 94224a0
  260399: 5086ca5
  260383: 5617fb1
  260351: 69d4438
v: v3
  • Loading branch information
Daniel Rebelo de Oliveira authored and Linus Torvalds committed Jul 26, 2011
1 parent ea78d49 commit 63e4b99
Show file tree
Hide file tree
Showing 2 changed files with 49 additions and 36 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 293eb1e7772b25a93647c798c7b89bf26c2da2e0
refs/heads/master: fb0a685cb95a0267a96153af2f72486f27be5847
83 changes: 48 additions & 35 deletions trunk/kernel/fork.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
* Protected counters by write_lock_irq(&tasklist_lock)
*/
unsigned long total_forks; /* Handle normal Linux uptimes. */
int nr_threads; /* The idle threads do not count.. */
int nr_threads; /* The idle threads do not count.. */

int max_threads; /* tunable limit on nr_threads */

Expand Down Expand Up @@ -232,7 +232,7 @@ void __init fork_init(unsigned long mempages)
/*
* we need to allow at least 20 threads to boot a system
*/
if(max_threads < 20)
if (max_threads < 20)
max_threads = 20;

init_task.signal->rlim[RLIMIT_NPROC].rlim_cur = max_threads/2;
Expand Down Expand Up @@ -268,7 +268,7 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
return NULL;
}

err = arch_dup_task_struct(tsk, orig);
err = arch_dup_task_struct(tsk, orig);
if (err)
goto out;

Expand All @@ -288,8 +288,11 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
tsk->stack_canary = get_random_int();
#endif

/* One for us, one for whoever does the "release_task()" (usually parent) */
atomic_set(&tsk->usage,2);
/*
* One for us, one for whoever does the "release_task()" (usually
* parent)
*/
atomic_set(&tsk->usage, 2);
#ifdef CONFIG_BLK_DEV_IO_TRACE
tsk->btrace_seq = 0;
#endif
Expand Down Expand Up @@ -437,15 +440,15 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
goto out;
}

static inline int mm_alloc_pgd(struct mm_struct * mm)
static inline int mm_alloc_pgd(struct mm_struct *mm)
{
mm->pgd = pgd_alloc(mm);
if (unlikely(!mm->pgd))
return -ENOMEM;
return 0;
}

static inline void mm_free_pgd(struct mm_struct * mm)
static inline void mm_free_pgd(struct mm_struct *mm)
{
pgd_free(mm, mm->pgd);
}
Expand Down Expand Up @@ -482,7 +485,7 @@ static void mm_init_aio(struct mm_struct *mm)
#endif
}

static struct mm_struct * mm_init(struct mm_struct * mm, struct task_struct *p)
static struct mm_struct *mm_init(struct mm_struct *mm, struct task_struct *p)
{
atomic_set(&mm->mm_users, 1);
atomic_set(&mm->mm_count, 1);
Expand Down Expand Up @@ -513,9 +516,9 @@ static struct mm_struct * mm_init(struct mm_struct * mm, struct task_struct *p)
/*
* Allocate and initialize an mm_struct.
*/
struct mm_struct * mm_alloc(void)
struct mm_struct *mm_alloc(void)
{
struct mm_struct * mm;
struct mm_struct *mm;

mm = allocate_mm();
if (!mm)
Expand Down Expand Up @@ -583,7 +586,7 @@ void added_exe_file_vma(struct mm_struct *mm)
void removed_exe_file_vma(struct mm_struct *mm)
{
mm->num_exe_file_vmas--;
if ((mm->num_exe_file_vmas == 0) && mm->exe_file){
if ((mm->num_exe_file_vmas == 0) && mm->exe_file) {
fput(mm->exe_file);
mm->exe_file = NULL;
}
Expand Down Expand Up @@ -775,9 +778,9 @@ struct mm_struct *dup_mm(struct task_struct *tsk)
return NULL;
}

static int copy_mm(unsigned long clone_flags, struct task_struct * tsk)
static int copy_mm(unsigned long clone_flags, struct task_struct *tsk)
{
struct mm_struct * mm, *oldmm;
struct mm_struct *mm, *oldmm;
int retval;

tsk->min_flt = tsk->maj_flt = 0;
Expand Down Expand Up @@ -844,7 +847,7 @@ static int copy_fs(unsigned long clone_flags, struct task_struct *tsk)
return 0;
}

static int copy_files(unsigned long clone_flags, struct task_struct * tsk)
static int copy_files(unsigned long clone_flags, struct task_struct *tsk)
{
struct files_struct *oldf, *newf;
int error = 0;
Expand Down Expand Up @@ -1166,11 +1169,11 @@ static struct task_struct *copy_process(unsigned long clone_flags,
cgroup_fork(p);
#ifdef CONFIG_NUMA
p->mempolicy = mpol_dup(p->mempolicy);
if (IS_ERR(p->mempolicy)) {
retval = PTR_ERR(p->mempolicy);
p->mempolicy = NULL;
goto bad_fork_cleanup_cgroup;
}
if (IS_ERR(p->mempolicy)) {
retval = PTR_ERR(p->mempolicy);
p->mempolicy = NULL;
goto bad_fork_cleanup_cgroup;
}
mpol_fix_fork_child_flag(p);
#endif
#ifdef CONFIG_CPUSETS
Expand Down Expand Up @@ -1216,25 +1219,33 @@ static struct task_struct *copy_process(unsigned long clone_flags,
retval = perf_event_init_task(p);
if (retval)
goto bad_fork_cleanup_policy;

if ((retval = audit_alloc(p)))
retval = audit_alloc(p);
if (retval)
goto bad_fork_cleanup_policy;
/* copy all the process information */
if ((retval = copy_semundo(clone_flags, p)))
retval = copy_semundo(clone_flags, p);
if (retval)
goto bad_fork_cleanup_audit;
if ((retval = copy_files(clone_flags, p)))
retval = copy_files(clone_flags, p);
if (retval)
goto bad_fork_cleanup_semundo;
if ((retval = copy_fs(clone_flags, p)))
retval = copy_fs(clone_flags, p);
if (retval)
goto bad_fork_cleanup_files;
if ((retval = copy_sighand(clone_flags, p)))
retval = copy_sighand(clone_flags, p);
if (retval)
goto bad_fork_cleanup_fs;
if ((retval = copy_signal(clone_flags, p)))
retval = copy_signal(clone_flags, p);
if (retval)
goto bad_fork_cleanup_sighand;
if ((retval = copy_mm(clone_flags, p)))
retval = copy_mm(clone_flags, p);
if (retval)
goto bad_fork_cleanup_signal;
if ((retval = copy_namespaces(clone_flags, p)))
retval = copy_namespaces(clone_flags, p);
if (retval)
goto bad_fork_cleanup_mm;
if ((retval = copy_io(clone_flags, p)))
retval = copy_io(clone_flags, p);
if (retval)
goto bad_fork_cleanup_namespaces;
retval = copy_thread(clone_flags, stack_start, stack_size, p, regs);
if (retval)
Expand All @@ -1256,7 +1267,7 @@ static struct task_struct *copy_process(unsigned long clone_flags,
/*
* Clear TID on mm_release()?
*/
p->clear_child_tid = (clone_flags & CLONE_CHILD_CLEARTID) ? child_tidptr: NULL;
p->clear_child_tid = (clone_flags & CLONE_CHILD_CLEARTID) ? child_tidptr : NULL;
#ifdef CONFIG_BLOCK
p->plug = NULL;
#endif
Expand Down Expand Up @@ -1324,7 +1335,7 @@ static struct task_struct *copy_process(unsigned long clone_flags,
* it's process group.
* A fatal signal pending means that current will exit, so the new
* thread can't slip out of an OOM kill (or normal SIGKILL).
*/
*/
recalc_sigpending();
if (signal_pending(current)) {
spin_unlock(&current->sighand->siglock);
Expand Down Expand Up @@ -1685,12 +1696,14 @@ SYSCALL_DEFINE1(unshare, unsigned long, unshare_flags)
*/
if (unshare_flags & (CLONE_NEWIPC|CLONE_SYSVSEM))
do_sysvsem = 1;
if ((err = unshare_fs(unshare_flags, &new_fs)))
err = unshare_fs(unshare_flags, &new_fs);
if (err)
goto bad_unshare_out;
if ((err = unshare_fd(unshare_flags, &new_fd)))
err = unshare_fd(unshare_flags, &new_fd);
if (err)
goto bad_unshare_cleanup_fs;
if ((err = unshare_nsproxy_namespaces(unshare_flags, &new_nsproxy,
new_fs)))
err = unshare_nsproxy_namespaces(unshare_flags, &new_nsproxy, new_fs);
if (err)
goto bad_unshare_cleanup_fd;

if (new_fs || new_fd || do_sysvsem || new_nsproxy) {
Expand Down

0 comments on commit 63e4b99

Please sign in to comment.