]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
vfio: Rename vfio_ioctl_check_extension()
authorJason Gunthorpe <jgg@nvidia.com>
Thu, 22 Sep 2022 19:20:24 +0000 (16:20 -0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 26 Nov 2022 08:27:52 +0000 (09:27 +0100)
[ Upstream commit 1408640d578887d7860737221043d91fc6d5a723 ]

To vfio_container_ioctl_check_extension().

A following patch will turn this into a non-static function, make it clear
it is related to the container.

Reviewed-by: Kevin Tian <kevin.tian@intel.com>
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
Link: https://lore.kernel.org/r/6-v3-297af71838d2+b9-vfio_container_split_jgg@nvidia.com
Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
Stable-dep-of: 7fdba0011157 ("vfio: Fix container device registration life cycle")
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/vfio/vfio_main.c

index 7cb56c382c97a25c8634b44148ea77bbdf228fff..c555d497e9e88b8926725db9914856499552e899 100644 (file)
@@ -710,8 +710,9 @@ EXPORT_SYMBOL_GPL(vfio_unregister_group_dev);
 /*
  * VFIO base fd, /dev/vfio/vfio
  */
-static long vfio_ioctl_check_extension(struct vfio_container *container,
-                                      unsigned long arg)
+static long
+vfio_container_ioctl_check_extension(struct vfio_container *container,
+                                    unsigned long arg)
 {
        struct vfio_iommu_driver *driver;
        long ret = 0;
@@ -868,7 +869,7 @@ static long vfio_fops_unl_ioctl(struct file *filep,
                ret = VFIO_API_VERSION;
                break;
        case VFIO_CHECK_EXTENSION:
-               ret = vfio_ioctl_check_extension(container, arg);
+               ret = vfio_container_ioctl_check_extension(container, arg);
                break;
        case VFIO_SET_IOMMU:
                ret = vfio_ioctl_set_iommu(container, arg);
@@ -1763,8 +1764,8 @@ bool vfio_file_enforced_coherent(struct file *file)
 
        down_read(&group->group_rwsem);
        if (group->container) {
-               ret = vfio_ioctl_check_extension(group->container,
-                                                VFIO_DMA_CC_IOMMU);
+               ret = vfio_container_ioctl_check_extension(group->container,
+                                                          VFIO_DMA_CC_IOMMU);
        } else {
                /*
                 * Since the coherency state is determined only once a container