소스 검색

iommu/vt-d: Use domain_remove_one_dev_info() in domain_add_dev_info() error path

Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
David Woodhouse 11 년 전
부모
커밋
e2f8c5f6d4
1개의 변경된 파일1개의 추가작업 그리고 7개의 파일을 삭제
  1. 1 7
      drivers/iommu/intel-iommu.c

+ 1 - 7
drivers/iommu/intel-iommu.c

@@ -2453,8 +2453,6 @@ static int domain_add_dev_info(struct dmar_domain *domain,
 			       int translation)
 			       int translation)
 {
 {
 	struct dmar_domain *ndomain;
 	struct dmar_domain *ndomain;
-	struct device_domain_info *info;
-	unsigned long flags;
 	int ret;
 	int ret;
 
 
 	ndomain = dmar_insert_dev_info(pci_domain_nr(pdev->bus),
 	ndomain = dmar_insert_dev_info(pci_domain_nr(pdev->bus),
@@ -2465,11 +2463,7 @@ static int domain_add_dev_info(struct dmar_domain *domain,
 
 
 	ret = domain_context_mapping(domain, pdev, translation);
 	ret = domain_context_mapping(domain, pdev, translation);
 	if (ret) {
 	if (ret) {
-		spin_lock_irqsave(&device_domain_lock, flags);
-		info = pdev->dev.archdata.iommu;
-		unlink_domain_info(info);
-		spin_unlock_irqrestore(&device_domain_lock, flags);
-		free_devinfo_mem(info);
+		domain_remove_one_dev_info(domain, pdev);
 		return ret;
 		return ret;
 	}
 	}