]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
privcmd_ioeventfd_assign(): don't open-code eventfd_ctx_fdget()
authorAl Viro <viro@zeniv.linux.org.uk>
Sat, 20 Jul 2024 05:31:47 +0000 (01:31 -0400)
committerAl Viro <viro@zeniv.linux.org.uk>
Sun, 3 Nov 2024 06:28:06 +0000 (01:28 -0500)
just call it, same as privcmd_ioeventfd_deassign() does...

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
drivers/xen/privcmd.c

index 3273cb8c2a6627ce9652773a0c16057aa12f7a8f..79070494070d9916a47a86ec005da408cfe64765 100644 (file)
@@ -1352,7 +1352,6 @@ static int privcmd_ioeventfd_assign(struct privcmd_ioeventfd *ioeventfd)
        struct privcmd_kernel_ioeventfd *kioeventfd;
        struct privcmd_kernel_ioreq *kioreq;
        unsigned long flags;
-       struct fd f;
        int ret;
 
        /* Check for range overflow */
@@ -1372,15 +1371,7 @@ static int privcmd_ioeventfd_assign(struct privcmd_ioeventfd *ioeventfd)
        if (!kioeventfd)
                return -ENOMEM;
 
-       f = fdget(ioeventfd->event_fd);
-       if (!fd_file(f)) {
-               ret = -EBADF;
-               goto error_kfree;
-       }
-
-       kioeventfd->eventfd = eventfd_ctx_fileget(fd_file(f));
-       fdput(f);
-
+       kioeventfd->eventfd = eventfd_ctx_fdget(ioeventfd->event_fd);
        if (IS_ERR(kioeventfd->eventfd)) {
                ret = PTR_ERR(kioeventfd->eventfd);
                goto error_kfree;