]> www.infradead.org Git - linux.git/commitdiff
vfio: remove the iommudata check in vfio_noiommu_attach_group
authorChristoph Hellwig <hch@lst.de>
Fri, 24 Sep 2021 15:56:53 +0000 (17:56 +0200)
committerAlex Williamson <alex.williamson@redhat.com>
Thu, 30 Sep 2021 18:46:43 +0000 (12:46 -0600)
vfio_noiommu_attach_group has two callers:

 1) __vfio_container_attach_groups is called by vfio_ioctl_set_iommu,
    which just called vfio_iommu_driver_allowed
 2) vfio_group_set_container requires already checks ->noiommu on the
    vfio_group, which is propagated from the iommudata in
    vfio_create_group

so this check is entirely superflous and can be removed.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Jason Gunthorpe <jgg@nvidia.com>
Reviewed-by: Kevin Tian <kevin.tian@intel.com>
Link: https://lore.kernel.org/r/20210924155705.4258-4-hch@lst.de
Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
drivers/vfio/vfio.c

index faf8e0d637bb94ef9447ee1aebb82345dc00a3cc..8bd4b0b96b94a399b6f73fefbd0f92a7aa7d99ad 100644 (file)
@@ -240,7 +240,7 @@ static long vfio_noiommu_ioctl(void *iommu_data,
 static int vfio_noiommu_attach_group(void *iommu_data,
                                     struct iommu_group *iommu_group)
 {
-       return iommu_group_get_iommudata(iommu_group) == &noiommu ? 0 : -EINVAL;
+       return 0;
 }
 
 static void vfio_noiommu_detach_group(void *iommu_data,