diff options
| author | Christian Brauner <brauner@kernel.org> | 2023-12-21 13:21:52 +0100 |
|---|---|---|
| committer | Christian Brauner <brauner@kernel.org> | 2023-12-21 13:21:52 +0100 |
| commit | 2137e1564267001b25143d21bc619189c1f74bc6 (patch) | |
| tree | e5d680049a77852f4cde8aa396c0faa72de4c854 /kernel | |
| parent | 1bfc466b13cf6652ba227c282c27a30ffede69a5 (diff) | |
| parent | 4e94ddfe2aab72139acb8d5372fac9e6c3f3e383 (diff) | |
| download | linux-integrator-2137e1564267001b25143d21bc619189c1f74bc6.tar.gz | |
Merge branch 'vfs.file'
Bring in the changes to the file infrastructure for this cycle. Mostly
cleanups and some performance tweaks.
* file: remove __receive_fd()
* file: stop exposing receive_fd_user()
* fs: replace f_rcuhead with f_task_work
* file: remove pointless wrapper
* file: s/close_fd_get_file()/file_close_fd()/g
* Improve __fget_files_rcu() code generation (and thus __fget_light())
* file: massage cleanup of files that failed to open
Signed-off-by: Christian Brauner <brauner@kernel.org>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/pid.c | 2 | ||||
| -rw-r--r-- | kernel/seccomp.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/kernel/pid.c b/kernel/pid.c index 6500ef956f2f88..b52b1086545415 100644 --- a/kernel/pid.c +++ b/kernel/pid.c @@ -700,7 +700,7 @@ static int pidfd_getfd(struct pid *pid, int fd) if (IS_ERR(file)) return PTR_ERR(file); - ret = receive_fd(file, O_CLOEXEC); + ret = receive_fd(file, NULL, O_CLOEXEC); fput(file); return ret; diff --git a/kernel/seccomp.c b/kernel/seccomp.c index 255999ba9190a6..aca7b437882e98 100644 --- a/kernel/seccomp.c +++ b/kernel/seccomp.c @@ -1072,7 +1072,7 @@ static void seccomp_handle_addfd(struct seccomp_kaddfd *addfd, struct seccomp_kn */ list_del_init(&addfd->list); if (!addfd->setfd) - fd = receive_fd(addfd->file, addfd->flags); + fd = receive_fd(addfd->file, NULL, addfd->flags); else fd = receive_fd_replace(addfd->fd, addfd->file, addfd->flags); addfd->ret = fd; |