diff options
| author | Christian Brauner <brauner@kernel.org> | 2025-11-23 17:33:48 +0100 |
|---|---|---|
| committer | Christian Brauner <brauner@kernel.org> | 2025-11-28 12:42:34 +0100 |
| commit | 245f0d1c622b0183ce4f44b3e39aeacf78fae594 (patch) | |
| tree | ef86b92239e01c3d0228b648ecf82a5dcb324a8e /net/socket.c | |
| parent | 0d52d06a199f5b95a66a3ff0a303a48532e3461f (diff) | |
net/socket: convert sock_map_fd() to FD_ADD()
Link: https://patch.msgid.link/20251123-work-fd-prepare-v4-30-b6efa1706cfd@kernel.org
Signed-off-by: Christian Brauner <brauner@kernel.org>
Diffstat (limited to 'net/socket.c')
| -rw-r--r-- | net/socket.c | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/net/socket.c b/net/socket.c index e8892b218708..db2065051d33 100644 --- a/net/socket.c +++ b/net/socket.c @@ -503,21 +503,12 @@ EXPORT_SYMBOL(sock_alloc_file); static int sock_map_fd(struct socket *sock, int flags) { - struct file *newfile; - int fd = get_unused_fd_flags(flags); - if (unlikely(fd < 0)) { - sock_release(sock); - return fd; - } + int fd; - newfile = sock_alloc_file(sock, flags, NULL); - if (!IS_ERR(newfile)) { - fd_install(fd, newfile); - return fd; - } - - put_unused_fd(fd); - return PTR_ERR(newfile); + fd = FD_ADD(flags, sock_alloc_file(sock, flags, NULL)); + if (fd < 0) + sock_release(sock); + return fd; } /** |