Page MenuHomeFreeBSD
Files F168230185

D25534.diff
No OneTemporary
Actions

D25534.diff
View Options

Index: head/sys/compat/linuxkpi/common/src/linux_current.c
===================================================================
--- head/sys/compat/linuxkpi/common/src/linux_current.c
+++ head/sys/compat/linuxkpi/common/src/linux_current.c
@@ -155,65 +155,52 @@
put_task_struct(ts);
}
-struct task_struct *
-linux_pid_task(pid_t pid)
+static struct task_struct *
+linux_get_pid_task_int(pid_t pid, const bool do_get)
{
struct thread *td;
struct proc *p;
+ struct task_struct *ts;
- /* try to find corresponding thread */
- td = tdfind(pid, -1);
- if (td != NULL) {
- struct task_struct *ts = td->td_lkpi_task;
- PROC_UNLOCK(td->td_proc);
- return (ts);
- }
-
- /* try to find corresponding procedure */
- p = pfind(pid);
- if (p != NULL) {
- FOREACH_THREAD_IN_PROC(p, td) {
- struct task_struct *ts = td->td_lkpi_task;
- if (ts != NULL) {
- PROC_UNLOCK(p);
- return (ts);
+ if (pid > PID_MAX) {
+ /* try to find corresponding thread */
+ td = tdfind(pid, -1);
+ if (td != NULL) {
+ ts = td->td_lkpi_task;
+ if (do_get && ts != NULL)
+ get_task_struct(ts);
+ PROC_UNLOCK(td->td_proc);
+ return (ts);
+ }
+ } else {
+ /* try to find corresponding procedure */
+ p = pfind(pid);
+ if (p != NULL) {
+ FOREACH_THREAD_IN_PROC(p, td) {
+ ts = td->td_lkpi_task;
+ if (ts != NULL) {
+ if (do_get)
+ get_task_struct(ts);
+ PROC_UNLOCK(p);
+ return (ts);
+ }
}
+ PROC_UNLOCK(p);
}
- PROC_UNLOCK(p);
}
return (NULL);
}
struct task_struct *
-linux_get_pid_task(pid_t pid)
+linux_pid_task(pid_t pid)
{
- struct thread *td;
- struct proc *p;
+ return (linux_get_pid_task_int(pid, false));
+}
- /* try to find corresponding thread */
- td = tdfind(pid, -1);
- if (td != NULL) {
- struct task_struct *ts = td->td_lkpi_task;
- if (ts != NULL)
- get_task_struct(ts);
- PROC_UNLOCK(td->td_proc);
- return (ts);
- }
-
- /* try to find corresponding procedure */
- p = pfind(pid);
- if (p != NULL) {
- FOREACH_THREAD_IN_PROC(p, td) {
- struct task_struct *ts = td->td_lkpi_task;
- if (ts != NULL) {
- get_task_struct(ts);
- PROC_UNLOCK(p);
- return (ts);
- }
- }
- PROC_UNLOCK(p);
- }
- return (NULL);
+struct task_struct *
+linux_get_pid_task(pid_t pid)
+{
+ return (linux_get_pid_task_int(pid, true));
}
bool

File Metadata

Mime Type
text/plain
Expires
Fri, Aug 28, 1:48 AM (7 h, 46 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
37419863
Default Alt Text
D25534.diff (2 KB)

Event Timeline