projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus-4.4-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git...
[firefly-linux-kernel-4.4.55.git]
/
kernel
/
pid.c
diff --git
a/kernel/pid.c
b/kernel/pid.c
index ca368793808e37688f7b0219b54d458fede30765..78b3d9f80d443fb4fa601e41088eb2041385ab20 100644
(file)
--- a/
kernel/pid.c
+++ b/
kernel/pid.c
@@
-467,7
+467,7
@@
struct pid *get_task_pid(struct task_struct *task, enum pid_type type)
rcu_read_lock();
if (type != PIDTYPE_PID)
task = task->group_leader;
rcu_read_lock();
if (type != PIDTYPE_PID)
task = task->group_leader;
- pid = get_pid(
task->pids[type].pid
);
+ pid = get_pid(
rcu_dereference(task->pids[type].pid)
);
rcu_read_unlock();
return pid;
}
rcu_read_unlock();
return pid;
}
@@
-528,7
+528,7
@@
pid_t __task_pid_nr_ns(struct task_struct *task, enum pid_type type,
if (likely(pid_alive(task))) {
if (type != PIDTYPE_PID)
task = task->group_leader;
if (likely(pid_alive(task))) {
if (type != PIDTYPE_PID)
task = task->group_leader;
- nr = pid_nr_ns(
task->pids[type].pid
, ns);
+ nr = pid_nr_ns(
rcu_dereference(task->pids[type].pid)
, ns);
}
rcu_read_unlock();
}
rcu_read_unlock();