From: Jan Beulich <jbeulich@suse.com>
Date: Fri, 10 Jun 2022 08:23:31 +0000 (+0200)
Subject: x86/mm: further simplify cleanup_page_mappings()
X-Git-Tag: archive/raspbian/4.17.0-1+rpi1^2~33^2~575
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=2730650c9cd65c1cb2412b480ee1f51748bc1445;p=xen.git

x86/mm: further simplify cleanup_page_mappings()

With the removal of update_xen_mappings() there's no need anymore for a
2nd error code variable to transiently hold the IOMMU unmap return
value.

Signed-off-by: Jan Beulich <jbeulich@suse.com>
Acked-by: Andrew Cooper <andrew.cooper3@citrix.com>
---

diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c
index 4f749fd888..ac74ae389c 100644
--- a/xen/arch/x86/mm.c
+++ b/xen/arch/x86/mm.c
@@ -2470,12 +2470,7 @@ static int cleanup_page_mappings(struct page_info *page)
         struct domain *d = page_get_owner(page);
 
         if ( d && unlikely(need_iommu_pt_sync(d)) && is_pv_domain(d) )
-        {
-            int rc2 = iommu_legacy_unmap(d, _dfn(mfn), 1u << PAGE_ORDER_4K);
-
-            if ( !rc )
-                rc = rc2;
-        }
+            rc = iommu_legacy_unmap(d, _dfn(mfn), 1u << PAGE_ORDER_4K);
 
         if ( likely(!is_special_page(page)) )
         {