Signed-off-by: Christian Brauner <brauner@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
- fs/pidfs.c | 9 +++++----
- kernel/exit.c | 6 +++---
- kernel/signal.c | 3 +--
+ fs/pidfs.c | 9 +++++----
+ kernel/exit.c | 6 +++---
+ kernel/signal.c | 3 +--
3 files changed, 9 insertions(+), 9 deletions(-)
-diff --git a/fs/pidfs.c b/fs/pidfs.c
-index 80675b6bf8845..52b7e4f767327 100644
--- a/fs/pidfs.c
+++ b/fs/pidfs.c
-@@ -95,20 +95,21 @@ static void pidfd_show_fdinfo(struct seq_file *m, struct file *f)
+@@ -95,20 +95,21 @@ static void pidfd_show_fdinfo(struct seq
static __poll_t pidfd_poll(struct file *file, struct poll_table_struct *pts)
{
struct pid *pid = pidfd_pid(file);
poll_flags = EPOLLIN | EPOLLRDNORM;
return poll_flags;
-diff --git a/kernel/exit.c b/kernel/exit.c
-index 9d888f26bf784..c94d23ccd1520 100644
--- a/kernel/exit.c
+++ b/kernel/exit.c
-@@ -745,10 +745,10 @@ static void exit_notify(struct task_struct *tsk, int group_dead)
+@@ -742,10 +742,10 @@ static void exit_notify(struct task_stru
tsk->exit_state = EXIT_ZOMBIE;
/*
do_notify_pidfd(tsk);
if (unlikely(tsk->ptrace)) {
-diff --git a/kernel/signal.c b/kernel/signal.c
-index 2ae45e6eb6bb8..468b589c39e69 100644
--- a/kernel/signal.c
+++ b/kernel/signal.c
-@@ -2063,8 +2063,7 @@ bool do_notify_parent(struct task_struct *tsk, int sig)
+@@ -2063,8 +2063,7 @@ bool do_notify_parent(struct task_struct
WARN_ON_ONCE(!tsk->ptrace &&
(tsk->group_leader != tsk || !thread_group_empty(tsk)));
/*
*/
if (thread_group_empty(tsk))
do_notify_pidfd(tsk);
---
-2.39.5
-
Signed-off-by: Christian Brauner <brauner@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
- fs/pidfs.c | 9 +++++----
- kernel/exit.c | 6 +++---
- kernel/signal.c | 3 +--
+ fs/pidfs.c | 9 +++++----
+ kernel/exit.c | 6 +++---
+ kernel/signal.c | 3 +--
3 files changed, 9 insertions(+), 9 deletions(-)
-diff --git a/fs/pidfs.c b/fs/pidfs.c
-index c0478b3c55d9f..9aa4c705776dd 100644
--- a/fs/pidfs.c
+++ b/fs/pidfs.c
-@@ -188,20 +188,21 @@ static void pidfd_show_fdinfo(struct seq_file *m, struct file *f)
+@@ -188,20 +188,21 @@ static void pidfd_show_fdinfo(struct seq
static __poll_t pidfd_poll(struct file *file, struct poll_table_struct *pts)
{
struct pid *pid = pidfd_pid(file);
poll_flags = EPOLLIN | EPOLLRDNORM;
return poll_flags;
-diff --git a/kernel/exit.c b/kernel/exit.c
-index 6bb59b16e33e1..a9960dd6d0aa0 100644
--- a/kernel/exit.c
+++ b/kernel/exit.c
-@@ -744,10 +744,10 @@ static void exit_notify(struct task_struct *tsk, int group_dead)
+@@ -741,10 +741,10 @@ static void exit_notify(struct task_stru
tsk->exit_state = EXIT_ZOMBIE;
/*
do_notify_pidfd(tsk);
if (unlikely(tsk->ptrace)) {
-diff --git a/kernel/signal.c b/kernel/signal.c
-index 875e97f6205a2..b2e5c90f29602 100644
--- a/kernel/signal.c
+++ b/kernel/signal.c
-@@ -2180,8 +2180,7 @@ bool do_notify_parent(struct task_struct *tsk, int sig)
+@@ -2180,8 +2180,7 @@ bool do_notify_parent(struct task_struct
WARN_ON_ONCE(!tsk->ptrace &&
(tsk->group_leader != tsk || !thread_group_empty(tsk)));
/*
*/
if (thread_group_empty(tsk))
do_notify_pidfd(tsk);
---
-2.39.5
-