]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
pseries: port papr_rtas_setup_file_interface() to FD_ADD()
authorChristian Brauner <brauner@kernel.org>
Sun, 23 Nov 2025 16:33:54 +0000 (17:33 +0100)
committerChristian Brauner <brauner@kernel.org>
Fri, 28 Nov 2025 11:42:35 +0000 (12:42 +0100)
Link: https://patch.msgid.link/20251123-work-fd-prepare-v4-36-b6efa1706cfd@kernel.org
Signed-off-by: Christian Brauner <brauner@kernel.org>
arch/powerpc/platforms/pseries/papr-rtas-common.c

index 33c606e3378ae72b96379d9349b6bf86cd37c9eb..1630e0cd210c946035114b25d4b9d3e806e54c55 100644 (file)
@@ -205,35 +205,18 @@ long papr_rtas_setup_file_interface(struct papr_rtas_sequence *seq,
                                char *name)
 {
        const struct papr_rtas_blob *blob;
-       struct file *file;
-       long ret;
        int fd;
 
        blob = papr_rtas_retrieve(seq);
        if (IS_ERR(blob))
                return PTR_ERR(blob);
 
-       fd = get_unused_fd_flags(O_RDONLY | O_CLOEXEC);
-       if (fd < 0) {
-               ret = fd;
-               goto free_blob;
-       }
-
-       file = anon_inode_getfile_fmode(name, fops, (void *)blob,
-                       O_RDONLY, FMODE_LSEEK | FMODE_PREAD);
-       if (IS_ERR(file)) {
-               ret = PTR_ERR(file);
-               goto put_fd;
-       }
-
-       fd_install(fd, file);
+       fd = FD_ADD(O_RDONLY | O_CLOEXEC,
+                  anon_inode_getfile_fmode(name, fops, (void *)blob, O_RDONLY,
+                                           FMODE_LSEEK | FMODE_PREAD));
+       if (fd < 0)
+               papr_rtas_blob_free(blob);
        return fd;
-
-put_fd:
-       put_unused_fd(fd);
-free_blob:
-       papr_rtas_blob_free(blob);
-       return ret;
 }
 
 /*