Skip to content

Commit 245f0d1

Browse files
committed
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>
1 parent 0d52d06 commit 245f0d1

1 file changed

Lines changed: 5 additions & 14 deletions

File tree

net/socket.c

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -503,21 +503,12 @@ EXPORT_SYMBOL(sock_alloc_file);
503503

504504
static int sock_map_fd(struct socket *sock, int flags)
505505
{
506-
struct file *newfile;
507-
int fd = get_unused_fd_flags(flags);
508-
if (unlikely(fd < 0)) {
509-
sock_release(sock);
510-
return fd;
511-
}
506+
int fd;
512507

513-
newfile = sock_alloc_file(sock, flags, NULL);
514-
if (!IS_ERR(newfile)) {
515-
fd_install(fd, newfile);
516-
return fd;
517-
}
518-
519-
put_unused_fd(fd);
520-
return PTR_ERR(newfile);
508+
fd = FD_ADD(flags, sock_alloc_file(sock, flags, NULL));
509+
if (fd < 0)
510+
sock_release(sock);
511+
return fd;
521512
}
522513

523514
/**

0 commit comments

Comments
 (0)