Signed-off-by: Christian Brauner --- virt/kvm/kvm_main.c | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index b7a0ae2a7b20..f8c5ed12d42d 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -4313,27 +4313,21 @@ static const struct file_operations kvm_vcpu_stats_fops = { static int kvm_vcpu_ioctl_get_stats_fd(struct kvm_vcpu *vcpu) { - int fd; - struct file *file; + int ret; char name[15 + ITOA_MAX_LEN + 1]; snprintf(name, sizeof(name), "kvm-vcpu-stats:%d", vcpu->vcpu_id); - fd = get_unused_fd_flags(O_CLOEXEC); - if (fd < 0) - return fd; - - file = anon_inode_getfile_fmode(name, &kvm_vcpu_stats_fops, vcpu, - O_RDONLY, FMODE_PREAD); - if (IS_ERR(file)) { - put_unused_fd(fd); - return PTR_ERR(file); - } + FD_PREPARE(fdf, O_CLOEXEC, anon_inode_getfile_fmode(name, + &kvm_vcpu_stats_fops, + vcpu, O_RDONLY, + FMODE_PREAD)); + ret = ACQUIRE_ERR(fd_prepare, &fdf); + if (ret) + return ret; kvm_get_kvm(vcpu->kvm); - fd_install(fd, file); - - return fd; + return fd_publish(fdf); } #ifdef CONFIG_KVM_GENERIC_PRE_FAULT_MEMORY -- 2.47.3