diff options
| author | Jens Axboe <axboe@kernel.dk> | 2023-12-12 07:42:24 -0700 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2023-12-12 07:42:24 -0700 |
| commit | 2394b311c6b5bab225e5307c819eb1ea59de49de (patch) | |
| tree | cae55cbcff25341023c3d93952610935bd0fa3ff /net/core/scm.c | |
| parent | a39b6ac3781d46ba18193c9dbb2110f31e9bffe9 (diff) | |
| parent | 4e94ddfe2aab72139acb8d5372fac9e6c3f3e383 (diff) | |
Merge branch 'vfs.file' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs into for-6.8/io_uring
Merge vfs.file from the VFS tree to avoid conflicts with receive_fd() now
having 3 arguments rather than just 2.
* 'vfs.file' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs:
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
Diffstat (limited to 'net/core/scm.c')
| -rw-r--r-- | net/core/scm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/scm.c b/net/core/scm.c index 7dc47c17d863..db3f7cd519c2 100644 --- a/net/core/scm.c +++ b/net/core/scm.c @@ -325,7 +325,7 @@ void scm_detach_fds(struct msghdr *msg, struct scm_cookie *scm) } for (i = 0; i < fdmax; i++) { - err = receive_fd_user(scm->fp->fp[i], cmsg_data + i, o_flags); + err = scm_recv_one_fd(scm->fp->fp[i], cmsg_data + i, o_flags); if (err < 0) break; } |