From: Christian Brauner <brauner@kernel.org>
Date: Sun, 23 Nov 2025 16:33:48 +0000 (+0100)
Subject: net/socket: convert sock_map_fd() to FD_ADD()
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=245f0d1c622b0183ce4f44b3e39aeacf78fae594;p=thirdparty%2Flinux.git

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>
---

diff --git a/net/socket.c b/net/socket.c
index e8892b2187087..db2065051d33c 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;
 }
 
 /**