vfio: Rename __vfio_group_unset_container()

To vfio_group_detach_container(). This function is really a container
function.

Fold the WARN_ON() into it as a precondition assertion.

A following patch will move the vfio_container functions to their own .c
file.

Reviewed-by: Kevin Tian <kevin.tian@intel.com>
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
Link: https://lore.kernel.org/r/2-v3-297af71838d2+b9-vfio_container_split_jgg@nvidia.com
Signed-off-by: Alex Williamson <alex.williamson@redhat.com>

diff --git a/drivers/vfio/vfio_main.c b/drivers/vfio/vfio_main.c
index f9d10dbcf3e6163b9ae7d07fddaf9ab7270be81d..3d8813125358a4caa96666d4f86f4b574cb690bd 100644 (file)
--- a/drivers/vfio/vfio_main.c
+++ b/drivers/vfio/vfio_main.c
@@ -1036,12 +1036,13 @@ static const struct file_operations vfio_fops = {
 /*
  * VFIO Group fd, /dev/vfio/$GROUP
  */
-static void __vfio_group_unset_container(struct vfio_group *group)
+static void vfio_group_detach_container(struct vfio_group *group)
 {
        struct vfio_container *container = group->container;
        struct vfio_iommu_driver *driver;
 
        lockdep_assert_held_write(&group->group_rwsem);
+       WARN_ON(group->container_users != 1);
 
        down_write(&container->group_lock);
 
@@ -1089,7 +1090,7 @@ static int vfio_group_ioctl_unset_container(struct vfio_group *group)
                ret = -EBUSY;
                goto out_unlock;
        }
-       __vfio_group_unset_container(group);
+       vfio_group_detach_container(group);
 
 out_unlock:
        up_write(&group->group_rwsem);
@@ -1441,10 +1442,8 @@ static int vfio_group_fops_release(struct inode *inode, struct file *filep)
         * is only called when there are no open devices.
         */
        WARN_ON(group->notifier.head);
-       if (group->container) {
-               WARN_ON(group->container_users != 1);
-               __vfio_group_unset_container(group);
-       }
+       if (group->container)
+               vfio_group_detach_container(group);
        group->opened_file = NULL;
        up_write(&group->group_rwsem);