[patch 25/40] pid: move pidfd_get_pid() to pid.c
STALE2175d
REVIEWED: 12 (9M)
From: Andrew Morton <akpm@linux-foundation.org>
Date: 2020-10-17 23:14:58
Also in:
linux-mm, mm-commits
5 review trailers.
From: Minchan Kim <minchan@kernel.org> Subject: pid: move pidfd_get_pid() to pid.c process_madvise syscall needs pidfd_get_pid function to translate pidfd to pid so this patch move the function to kernel/pid.c. Link: http://lkml.kernel.org/r/20200302193630.68771-5-minchan@kernel.org Link: http://lkml.kernel.org/r/20200622192900.22757-3-minchan@kernel.org Link: https://lkml.kernel.org/r/20200901000633.1920247-3-minchan@kernel.org Reviewed-by: Suren Baghdasaryan <surenb@google.com> Suggested-by: Alexander Duyck <redacted> Reviewed-by: Alexander Duyck <redacted> Acked-by: Christian Brauner <redacted> Reviewed-by: Vlastimil Babka <redacted> Acked-by: David Rientjes <rientjes@google.com> Signed-off-by: Minchan Kim <minchan@kernel.org> Cc: Jens Axboe <axboe@kernel.dk> Cc: Jann Horn <jannh@google.com> Cc: Brian Geffon <redacted> Cc: Daniel Colascione <redacted> Cc: Joel Fernandes <redacted> Cc: Johannes Weiner <hannes@cmpxchg.org> Cc: John Dias <redacted> Cc: Kirill Tkhai <redacted> Cc: Michal Hocko <mhocko@suse.com> Cc: Oleksandr Natalenko <redacted> Cc: Sandeep Patil <redacted> Cc: SeongJae Park <redacted> Cc: SeongJae Park <redacted> Cc: Shakeel Butt <redacted> Cc: Sonny Rao <redacted> Cc: Tim Murray <redacted> Cc: Christian Brauner <redacted> Cc: Florian Weimer <redacted> Cc: <redacted> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> --- include/linux/pid.h | 1 + kernel/exit.c | 19 ------------------- kernel/pid.c | 19 +++++++++++++++++++ 3 files changed, 20 insertions(+), 19 deletions(-)
--- a/include/linux/pid.h~pid-move-pidfd_get_pid-to-pidc
+++ a/include/linux/pid.h@@ -77,6 +77,7 @@ extern const struct file_operations pidf struct file; extern struct pid *pidfd_pid(const struct file *file); +struct pid *pidfd_get_pid(unsigned int fd, unsigned int *flags); static inline struct pid *get_pid(struct pid *pid) { --- a/kernel/exit.c~pid-move-pidfd_get_pid-to-pidc +++ a/kernel/exit.c
@@ -1474,25 +1474,6 @@ end: return retval; } -static struct pid *pidfd_get_pid(unsigned int fd, unsigned int *flags) -{ - struct fd f; - struct pid *pid; - - f = fdget(fd); - if (!f.file) - return ERR_PTR(-EBADF); - - pid = pidfd_pid(f.file); - if (!IS_ERR(pid)) { - get_pid(pid); - *flags = f.file->f_flags; - } - - fdput(f); - return pid; -} - static long kernel_waitid(int which, pid_t upid, struct waitid_info *infop, int options, struct rusage *ru) { --- a/kernel/pid.c~pid-move-pidfd_get_pid-to-pidc +++ a/kernel/pid.c
@@ -520,6 +520,25 @@ struct pid *find_ge_pid(int nr, struct p return idr_get_next(&ns->idr, &nr); } +struct pid *pidfd_get_pid(unsigned int fd, unsigned int *flags) +{ + struct fd f; + struct pid *pid; + + f = fdget(fd); + if (!f.file) + return ERR_PTR(-EBADF); + + pid = pidfd_pid(f.file); + if (!IS_ERR(pid)) { + get_pid(pid); + *flags = f.file->f_flags; + } + + fdput(f); + return pid; +} + /** * pidfd_create() - Create a new pid file descriptor. *
_