[PATCH 22/39] privcmd_ioeventfd_assign(): don't open-code eventfd_ctx_fdget()
From: viro@kernel.org
Date: 2024-07-30 05:15:07
Also in:
bpf, cgroups, kvm, linux-fsdevel
Subsystem:
the rest, xen hypervisor interface · Maintainers:
Linus Torvalds, Juergen Gross, Stefano Stabellini
From: Al Viro <viro@zeniv.linux.org.uk> just call it, same as privcmd_ioeventfd_deassign() does... Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> --- drivers/xen/privcmd.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-)
diff --git a/drivers/xen/privcmd.c b/drivers/xen/privcmd.c
index 54e4f285c0f4..ba02b732fa49 100644
--- a/drivers/xen/privcmd.c
+++ b/drivers/xen/privcmd.c@@ -1324,7 +1324,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 */
@@ -1344,15 +1343,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;
--
2.39.2