GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-27 00:51:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

kernel/fork.c: fix a few coding style issues

Browse source 
Signed-off-by: Daniel Rebelo de Oliveira <psykon@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Daniel Rebelo de Oliveira 2011-07-26 16:08:39 -07:00 • committed by Linus Torvalds
parent 293eb1e777
commit fb0a685cb9
1 changed files with 48 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

67
kernel/fork.c
View file

@ -232,7 +232,7 @@ void __init fork_init(unsigned long mempages)
/* /*
* we need to allow at least 20 threads to boot a system * we need to allow at least 20 threads to boot a system
*/ */
if(max_threads < 20) if (max_threads < 20)
max_threads = 20; max_threads = 20;
init_task.signal->rlim[RLIMIT_NPROC].rlim_cur = max_threads/2; init_task.signal->rlim[RLIMIT_NPROC].rlim_cur = max_threads/2;
@ -288,8 +288,11 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
tsk->stack_canary = get_random_int(); tsk->stack_canary = get_random_int();
#endif #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 #ifdef CONFIG_BLK_DEV_IO_TRACE
tsk->btrace_seq = 0; tsk->btrace_seq = 0;
#endif #endif
@ -437,7 +440,7 @@ fail_nomem:
goto out; 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); mm->pgd = pgd_alloc(mm);
if (unlikely(!mm->pgd)) if (unlikely(!mm->pgd))
@ -445,7 +448,7 @@ static inline int mm_alloc_pgd(struct mm_struct * mm)
return 0; 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); pgd_free(mm, mm->pgd);
} }
@ -482,7 +485,7 @@ static void mm_init_aio(struct mm_struct *mm)
#endif #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_users, 1);
atomic_set(&mm->mm_count, 1); atomic_set(&mm->mm_count, 1);
@ -513,9 +516,9 @@ static struct mm_struct * mm_init(struct mm_struct * mm, struct task_struct *p)
/* /*
* Allocate and initialize an mm_struct. * 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(); mm = allocate_mm();
if (!mm) if (!mm)
@ -583,7 +586,7 @@ void added_exe_file_vma(struct mm_struct *mm)
void removed_exe_file_vma(struct mm_struct *mm) void removed_exe_file_vma(struct mm_struct *mm)
{ {
mm->num_exe_file_vmas--; 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); fput(mm->exe_file);
mm->exe_file = NULL; mm->exe_file = NULL;
} }
@ -775,9 +778,9 @@ fail_nocontext:
return NULL; 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; int retval;
tsk->min_flt = tsk->maj_flt = 0; tsk->min_flt = tsk->maj_flt = 0;
@ -844,7 +847,7 @@ static int copy_fs(unsigned long clone_flags, struct task_struct *tsk)
return 0; 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; struct files_struct *oldf, *newf;
int error = 0; int error = 0;
@ -1216,25 +1219,33 @@ static struct task_struct *copy_process(unsigned long clone_flags,
retval = perf_event_init_task(p); retval = perf_event_init_task(p);
if (retval) if (retval)
goto bad_fork_cleanup_policy; goto bad_fork_cleanup_policy;
retval = audit_alloc(p);
if ((retval = audit_alloc(p))) if (retval)
goto bad_fork_cleanup_policy; goto bad_fork_cleanup_policy;
/* copy all the process information */ /* 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; 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; 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; 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; 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; 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; 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; 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; goto bad_fork_cleanup_namespaces;
retval = copy_thread(clone_flags, stack_start, stack_size, p, regs); retval = copy_thread(clone_flags, stack_start, stack_size, p, regs);
if (retval) if (retval)
@ -1256,7 +1267,7 @@ static struct task_struct *copy_process(unsigned long clone_flags,
/* /*
* Clear TID on mm_release()? * 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 #ifdef CONFIG_BLOCK
p->plug = NULL; p->plug = NULL;
#endif #endif
@ -1685,12 +1696,14 @@ SYSCALL_DEFINE1(unshare, unsigned long, unshare_flags)
*/ */
if (unshare_flags & (CLONE_NEWIPC|CLONE_SYSVSEM)) if (unshare_flags & (CLONE_NEWIPC|CLONE_SYSVSEM))
do_sysvsem = 1; do_sysvsem = 1;
if ((err = unshare_fs(unshare_flags, &new_fs))) err = unshare_fs(unshare_flags, &new_fs);
if (err)
goto bad_unshare_out; 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; goto bad_unshare_cleanup_fs;
if ((err = unshare_nsproxy_namespaces(unshare_flags, &new_nsproxy, err = unshare_nsproxy_namespaces(unshare_flags, &new_nsproxy, new_fs);
new_fs))) if (err)
goto bad_unshare_cleanup_fd; goto bad_unshare_cleanup_fd;
if (new_fs || new_fd || do_sysvsem || new_nsproxy) { if (new_fs || new_fd || do_sysvsem || new_nsproxy) {