Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 80570698 authored by Minchan Kim's avatar Minchan Kim Committed by Charan Teja Reddy
Browse files

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.

Change-Id: Ie3bfdb29b3fb73a444481739b705ac7eb762d6c2
Link: http://lkml.kernel.org/r/20200302193630.68771-5-minchan@kernel.org


Signed-off-by: default avatarMinchan Kim <minchan@kernel.org>
Reviewed-by: default avatarSuren Baghdasaryan <surenb@google.com>
Suggested-by: default avatarAlexander Duyck <alexander.h.duyck@linux.intel.com>
Reviewed-by: default avatarAlexander Duyck <alexander.h.duyck@linux.intel.com>
Acked-by: default avatarChristian Brauner <christian.brauner@ubuntu.com>
Reviewed-by: default avatarVlastimil Babka <vbabka@suse.cz>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: Jann Horn <jannh@google.com>
Cc: Brian Geffon <bgeffon@google.com>
Cc: Daniel Colascione <dancol@google.com>
Cc: Joel Fernandes <joel@joelfernandes.org>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: John Dias <joaodias@google.com>
Cc: Kirill Tkhai <ktkhai@virtuozzo.com>
Cc: Michal Hocko <mhocko@suse.com>
Cc: Oleksandr Natalenko <oleksandr@redhat.com>
Cc: Sandeep Patil <sspatil@google.com>
Cc: SeongJae Park <sj38.park@gmail.com>
Cc: SeongJae Park <sjpark@amazon.de>
Cc: Shakeel Butt <shakeelb@google.com>
Cc: Sonny Rao <sonnyrao@google.com>
Cc: Tim Murray <timmurray@google.com>
Cc: Christian Brauner <christian.brauner@ubuntu.com>
Cc: <linux-man@vger.kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Git-Commit: e54e957dea26d6795d51842a785b8765efff396b
Git-Repo: git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git


Signed-off-by: default avatarCharan Teja Reddy <charante@codeaurora.org>
parent ab3b21e5

include/linux/pid.h

+1 −0
Original line number Diff line number Diff line
@@ -75,6 +75,7 @@ extern const struct file_operations pidfd_fops; 
struct file;



extern struct pid *pidfd_pid(const struct file *file);

struct pid *pidfd_get_pid(unsigned int fd);



static inline struct pid *get_pid(struct pid *pid)

{

kernel/exit.c

+0 −17
Original line number Diff line number Diff line
@@ -1470,23 +1470,6 @@ static long do_wait(struct wait_opts *wo) 
	return retval;

}



static struct pid *pidfd_get_pid(unsigned int fd)

{

	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);



	fdput(f);

	return pid;

}



static long kernel_waitid(int which, pid_t upid, struct waitid_info *infop,

			  int options, struct rusage *ru)

{

kernel/pid.c

+17 −0
Original line number Diff line number Diff line
@@ -454,6 +454,23 @@ struct pid *find_ge_pid(int nr, struct pid_namespace *ns) 
	return idr_get_next(&ns->idr, &nr);

}



struct pid *pidfd_get_pid(unsigned int fd)

{

	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);



	fdput(f);

	return pid;

}



/**

 * pidfd_create() - Create a new pid file descriptor.

 *