[PATCH] drivers:vfio: make the logic cleaner with braket

From: jianchunfu
Date: Tue Mar 08 2022 - 04:54:41 EST


Use braket to avoid identifying operators in function
vfio_iova_dirty_bitmap() and vfio_dma_do_unmap()
when there are too many field values.

Signed-off-by: jianchunfu <jianchunfu@xxxxxxxxxxxxxxxxxxxx>
---
drivers/vfio/vfio_iommu_type1.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/vfio/vfio_iommu_type1.c b/drivers/vfio/vfio_iommu_type1.c
index 9394aa944..199547012 100644
--- a/drivers/vfio/vfio_iommu_type1.c
+++ b/drivers/vfio/vfio_iommu_type1.c
@@ -1251,7 +1251,7 @@ static int vfio_iova_dirty_bitmap(u64 __user *bitmap, struct vfio_iommu *iommu,
return -EINVAL;

dma = vfio_find_dma(iommu, iova + size - 1, 0);
- if (dma && dma->iova + dma->size != iova + size)
+ if (dma && (dma->iova + dma->size) != (iova + size))
return -EINVAL;

for (n = rb_first(&iommu->dma_list); n; n = rb_next(n)) {
@@ -1363,7 +1363,7 @@ static int vfio_dma_do_unmap(struct vfio_iommu *iommu,
goto unlock;

dma = vfio_find_dma(iommu, iova + size - 1, 0);
- if (dma && dma->iova + dma->size != iova + size)
+ if (dma && (dma->iova + dma->size) != (iova + size))
goto unlock;
}

@@ -2958,7 +2958,7 @@ static int vfio_iommu_type1_dirty_pages(struct vfio_iommu *iommu,
ret = -EINVAL;
goto out_unlock;
}
- if (!range.size || range.size & (iommu_pgsize - 1)) {
+ if (!range.size || (range.size & (iommu_pgsize - 1))) {
ret = -EINVAL;
goto out_unlock;
}
--
2.18.4