[PATCH v5 09/29] vfio: powerpc/spapr: Rework attach/detach

[Alexey Kardashevskiy]

This is to make extended ownership and multiple groups support patches
simpler for review.

This is a mechanical patch.

Signed-off-by: Alexey Kardashevskiy <a...@ozlabs.ru>
---
 drivers/vfio/vfio_iommu_spapr_tce.c | 38 ++++++++++++++++++++++---------------
 1 file changed, 23 insertions(+), 15 deletions(-)

diff --git a/drivers/vfio/vfio_iommu_spapr_tce.c 
b/drivers/vfio/vfio_iommu_spapr_tce.c
index f0dfd95..235d915 100644
--- a/drivers/vfio/vfio_iommu_spapr_tce.c
+++ b/drivers/vfio/vfio_iommu_spapr_tce.c
@@ -752,16 +752,21 @@ static int tce_iommu_attach_group(void *iommu_data,
                                iommu_group_id(container->tbl->it_group),
                                iommu_group_id(iommu_group));
                ret = -EBUSY;
-       } else if (container->enabled) {
+               goto unlock_exit;
+       }
+
+       if (container->enabled) {
                pr_err("tce_vfio: attaching group #%u to enabled container\n",
                                iommu_group_id(iommu_group));
                ret = -EBUSY;
-       } else {
-               ret = iommu_take_ownership(tbl);
-               if (!ret)
-                       container->tbl = tbl;
+               goto unlock_exit;
        }
 
+       ret = iommu_take_ownership(tbl);
+       if (!ret)
+               container->tbl = tbl;
+
+unlock_exit:
        mutex_unlock(&container->lock);
 
        return ret;
@@ -779,18 +784,21 @@ static void tce_iommu_detach_group(void *iommu_data,
                pr_warn("tce_vfio: detaching group #%u, expected group is 
#%u\n",
                                iommu_group_id(iommu_group),
                                iommu_group_id(tbl->it_group));
-       } else {
-               if (container->enabled) {
-                       pr_warn("tce_vfio: detaching group #%u from enabled 
container, forcing disable\n",
-                                       iommu_group_id(tbl->it_group));
-                       tce_iommu_disable(container);
-               }
+               goto unlock_exit;
+       }
 
-               /* pr_debug("tce_vfio: detaching group #%u from iommu %p\n",
-                               iommu_group_id(iommu_group), iommu_group); */
-               container->tbl = NULL;
-               iommu_release_ownership(tbl);
+       if (container->enabled) {
+               pr_warn("tce_vfio: detaching group #%u from enabled container, 
forcing disable\n",
+                               iommu_group_id(tbl->it_group));
+               tce_iommu_disable(container);
        }
+
+       /* pr_debug("tce_vfio: detaching group #%u from iommu %p\n",
+          iommu_group_id(iommu_group), iommu_group); */
+       container->tbl = NULL;
+       iommu_release_ownership(tbl);
+
+unlock_exit:
        mutex_unlock(&container->lock);
 }
 
-- 
2.0.0

--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html