Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
bb380ec3
Commit
bb380ec3
authored
7 years ago
by
Al Viro
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
kill wait_noreap_copyout()
folds into callers Signed-off-by:
Al Viro
<
viro@zeniv.linux.org.uk
>
parent
e61a2502
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
25 additions
and
40 deletions
+25
-40
kernel/exit.c
kernel/exit.c
+25
-40
No files found.
kernel/exit.c
View file @
bb380ec3
...
@@ -1057,22 +1057,6 @@ eligible_child(struct wait_opts *wo, bool ptrace, struct task_struct *p)
...
@@ -1057,22 +1057,6 @@ eligible_child(struct wait_opts *wo, bool ptrace, struct task_struct *p)
return
1
;
return
1
;
}
}
static
int
wait_noreap_copyout
(
struct
wait_opts
*
wo
,
struct
task_struct
*
p
,
pid_t
pid
,
uid_t
uid
,
int
why
,
int
status
)
{
struct
waitid_info
*
infop
;
put_task_struct
(
p
);
infop
=
wo
->
wo_info
;
if
(
infop
)
{
infop
->
cause
=
why
;
infop
->
pid
=
pid
;
infop
->
uid
=
uid
;
infop
->
status
=
status
;
}
return
pid
;
}
/*
/*
* Handle sys_wait4 work for one task in state EXIT_ZOMBIE. We hold
* Handle sys_wait4 work for one task in state EXIT_ZOMBIE. We hold
* read_lock(&tasklist_lock) on entry. If we return zero, we still hold
* read_lock(&tasklist_lock) on entry. If we return zero, we still hold
...
@@ -1091,22 +1075,27 @@ static int wait_task_zombie(struct wait_opts *wo, struct task_struct *p)
...
@@ -1091,22 +1075,27 @@ static int wait_task_zombie(struct wait_opts *wo, struct task_struct *p)
if
(
unlikely
(
wo
->
wo_flags
&
WNOWAIT
))
{
if
(
unlikely
(
wo
->
wo_flags
&
WNOWAIT
))
{
int
exit_code
=
p
->
exit_code
;
int
exit_code
=
p
->
exit_code
;
int
why
;
get_task_struct
(
p
);
get_task_struct
(
p
);
read_unlock
(
&
tasklist_lock
);
read_unlock
(
&
tasklist_lock
);
sched_annotate_sleep
();
sched_annotate_sleep
();
if
(
wo
->
wo_rusage
)
if
(
wo
->
wo_rusage
)
getrusage
(
p
,
RUSAGE_BOTH
,
wo
->
wo_rusage
);
getrusage
(
p
,
RUSAGE_BOTH
,
wo
->
wo_rusage
);
put_task_struct
(
p
);
infop
=
wo
->
wo_info
;
if
(
infop
)
{
if
((
exit_code
&
0x7f
)
==
0
)
{
if
((
exit_code
&
0x7f
)
==
0
)
{
why
=
CLD_EXITED
;
infop
->
cause
=
CLD_EXITED
;
status
=
exit_code
>>
8
;
infop
->
status
=
exit_code
>>
8
;
}
else
{
}
else
{
why
=
(
exit_code
&
0x80
)
?
CLD_DUMPED
:
CLD_KILLED
;
infop
->
cause
=
(
exit_code
&
0x80
)
?
CLD_DUMPED
:
CLD_KILLED
;
status
=
exit_code
&
0x7f
;
infop
->
status
=
exit_code
&
0x7f
;
}
}
return
wait_noreap_copyout
(
wo
,
p
,
pid
,
uid
,
why
,
status
);
infop
->
pid
=
pid
;
infop
->
uid
=
uid
;
}
return
pid
;
}
}
/*
/*
* Move the task's state to DEAD/TRACE, only one thread can do this.
* Move the task's state to DEAD/TRACE, only one thread can do this.
...
@@ -1297,10 +1286,9 @@ static int wait_task_stopped(struct wait_opts *wo,
...
@@ -1297,10 +1286,9 @@ static int wait_task_stopped(struct wait_opts *wo,
sched_annotate_sleep
();
sched_annotate_sleep
();
if
(
wo
->
wo_rusage
)
if
(
wo
->
wo_rusage
)
getrusage
(
p
,
RUSAGE_BOTH
,
wo
->
wo_rusage
);
getrusage
(
p
,
RUSAGE_BOTH
,
wo
->
wo_rusage
);
put_task_struct
(
p
);
if
(
unlikely
(
wo
->
wo_flags
&
WNOWAIT
))
if
(
likely
(
!
(
wo
->
wo_flags
&
WNOWAIT
)))
return
wait_noreap_copyout
(
wo
,
p
,
pid
,
uid
,
why
,
exit_code
);
wo
->
wo_stat
=
(
exit_code
<<
8
)
|
0x7f
;
wo
->
wo_stat
=
(
exit_code
<<
8
)
|
0x7f
;
infop
=
wo
->
wo_info
;
infop
=
wo
->
wo_info
;
...
@@ -1310,9 +1298,6 @@ static int wait_task_stopped(struct wait_opts *wo,
...
@@ -1310,9 +1298,6 @@ static int wait_task_stopped(struct wait_opts *wo,
infop
->
pid
=
pid
;
infop
->
pid
=
pid
;
infop
->
uid
=
uid
;
infop
->
uid
=
uid
;
}
}
put_task_struct
(
p
);
BUG_ON
(
!
pid
);
return
pid
;
return
pid
;
}
}
...
@@ -1324,7 +1309,7 @@ static int wait_task_stopped(struct wait_opts *wo,
...
@@ -1324,7 +1309,7 @@ static int wait_task_stopped(struct wait_opts *wo,
*/
*/
static
int
wait_task_continued
(
struct
wait_opts
*
wo
,
struct
task_struct
*
p
)
static
int
wait_task_continued
(
struct
wait_opts
*
wo
,
struct
task_struct
*
p
)
{
{
int
retval
;
struct
waitid_info
*
infop
;
pid_t
pid
;
pid_t
pid
;
uid_t
uid
;
uid_t
uid
;
...
@@ -1351,18 +1336,18 @@ static int wait_task_continued(struct wait_opts *wo, struct task_struct *p)
...
@@ -1351,18 +1336,18 @@ static int wait_task_continued(struct wait_opts *wo, struct task_struct *p)
sched_annotate_sleep
();
sched_annotate_sleep
();
if
(
wo
->
wo_rusage
)
if
(
wo
->
wo_rusage
)
getrusage
(
p
,
RUSAGE_BOTH
,
wo
->
wo_rusage
);
getrusage
(
p
,
RUSAGE_BOTH
,
wo
->
wo_rusage
);
if
(
!
wo
->
wo_info
)
{
put_task_struct
(
p
);
put_task_struct
(
p
);
infop
=
wo
->
wo_info
;
if
(
!
infop
)
{
wo
->
wo_stat
=
0xffff
;
wo
->
wo_stat
=
0xffff
;
retval
=
pid
;
}
else
{
}
else
{
retval
=
wait_noreap_copyout
(
wo
,
p
,
pid
,
uid
,
infop
->
cause
=
CLD_CONTINUED
;
CLD_CONTINUED
,
SIGCONT
);
infop
->
pid
=
pid
;
BUG_ON
(
retval
==
0
);
infop
->
uid
=
uid
;
infop
->
status
=
SIGCONT
;
}
}
return
pid
;
return
retval
;
}
}
/*
/*
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment