summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--virt/kvm/vfio.c14
1 files changed, 4 insertions, 10 deletions
diff --git a/virt/kvm/vfio.c b/virt/kvm/vfio.c
index 2fee1e82f8f6..6cdc4e9a333a 100644
--- a/virt/kvm/vfio.c
+++ b/virt/kvm/vfio.c
@@ -190,27 +190,21 @@ static int kvm_vfio_file_del(struct kvm_device *dev, unsigned int fd)
struct kvm_vfio *kv = dev->private;
struct kvm_vfio_file *kvf;
CLASS(fd, f)(fd);
- int ret;
if (fd_empty(f))
return -EBADF;
- ret = -ENOENT;
-
- mutex_lock(&kv->lock);
+ guard(mutex)(&kv->lock);
list_for_each_entry(kvf, &kv->file_list, node) {
if (kvf->file == fd_file(f)) {
kvm_vfio_file_free(dev, kvf);
- ret = 0;
- break;
+ kvm_vfio_update_coherency(dev);
+ return 0;
}
}
- kvm_vfio_update_coherency(dev);
-
- mutex_unlock(&kv->lock);
- return ret;
+ return -ENOENT;
}
#ifdef CONFIG_SPAPR_TCE_IOMMU