From: Christian Brauner <brauner@kernel.org>
Date: Sun, 23 Nov 2025 16:33:59 +0000 (+0100)
Subject: ntsync: convert ntsync_obj_get_fd() to FD_PREPARE()
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=af66279a012b2d9a175486a6292d41513ae7b74f;p=thirdparty%2Flinux.git

ntsync: convert ntsync_obj_get_fd() to FD_PREPARE()

Link: https://patch.msgid.link/20251123-work-fd-prepare-v4-41-b6efa1706cfd@kernel.org
Signed-off-by: Christian Brauner <brauner@kernel.org>
---

diff --git a/drivers/misc/ntsync.c b/drivers/misc/ntsync.c
index 999026a1ae048..9087f045e3627 100644
--- a/drivers/misc/ntsync.c
+++ b/drivers/misc/ntsync.c
@@ -721,21 +721,12 @@ static struct ntsync_obj *ntsync_alloc_obj(struct ntsync_device *dev,
 
 static int ntsync_obj_get_fd(struct ntsync_obj *obj)
 {
-	struct file *file;
-	int fd;
-
-	fd = get_unused_fd_flags(O_CLOEXEC);
-	if (fd < 0)
-		return fd;
-	file = anon_inode_getfile("ntsync", &ntsync_obj_fops, obj, O_RDWR);
-	if (IS_ERR(file)) {
-		put_unused_fd(fd);
-		return PTR_ERR(file);
-	}
-	obj->file = file;
-	fd_install(fd, file);
-
-	return fd;
+	FD_PREPARE(fdf, O_CLOEXEC,
+		   anon_inode_getfile("ntsync", &ntsync_obj_fops, obj, O_RDWR));
+	if (fdf.err)
+		return fdf.err;
+	obj->file = fd_prepare_file(fdf);
+	return fd_publish(fdf);
 }
 
 static int ntsync_create_sem(struct ntsync_device *dev, void __user *argp)