diff options
| author |   Andreas Gruenbacher <agruenba@redhat.com> | 2022-10-09 22:56:28 +0200 |
|---|---|---|
| committer | Andreas Gruenbacher <agruenba@redhat.com> | 2022-10-09 22:56:28 +0200 |
| commit | c7d7d2d345697eb3781198e58a22504feb74af63 (patch) | |
| tree | 66bf10cf2aeceea847adf863d616f545526edb74 /kernel | |
| parent | gfs2: Register fs after creating workqueues (diff) | |
| parent | gfs2: Mark the remaining process-independent glock holders as GL_NOPID (diff) | |
| download | linux-dev-c7d7d2d345697eb3781198e58a22504feb74af63.tar.xz linux-dev-c7d7d2d345697eb3781198e58a22504feb74af63.zip | |
gfs2: Merge branch 'for-next.nopid' into for-next
Resolves a conflict in gfs2_inode_lookup() between the following commits:
gfs2: Use TRY lock in gfs2_inode_lookup for UNLINKED inodes
gfs2: Mark the remaining process-independent glock holders as GL_NOPID
Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/pid.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/pid.c b/kernel/pid.c index 2fc0a16ec77b..3fbc5e46b721 100644 --- a/kernel/pid.c +++ b/kernel/pid.c @@ -519,6 +519,7 @@ struct pid *find_ge_pid(int nr, struct pid_namespace *ns) { return idr_get_next(&ns->idr, &nr); } +EXPORT_SYMBOL_GPL(find_ge_pid); struct pid *pidfd_get_pid(unsigned int fd, unsigned int *flags) { |