[PATCH v1 3/4] powerpc/mm: remove linear mapping if __add_pages() fails in arch_add_memory()

[David Hildenbrand]

Let's revert what we did in case seomthing goes wrong and we return an
error.

Cc: Michael Ellerman <m...@ellerman.id.au>
Cc: Benjamin Herrenschmidt <b...@kernel.crashing.org>
Cc: Paul Mackerras <pau...@samba.org>
Cc: Rashmica Gupta <rashmic...@gmail.com>
Cc: Andrew Morton <a...@linux-foundation.org>
Cc: Mike Rapoport <r...@kernel.org>
Cc: Michal Hocko <mho...@suse.com>
Cc: Oscar Salvador <osalva...@suse.de>
Cc: Wei Yang <richard.weiy...@linux.alibaba.com>
Signed-off-by: David Hildenbrand <da...@redhat.com>
---
 arch/powerpc/mm/mem.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/arch/powerpc/mm/mem.c b/arch/powerpc/mm/mem.c
index 685028451dd2..69b3e8072261 100644
--- a/arch/powerpc/mm/mem.c
+++ b/arch/powerpc/mm/mem.c
@@ -165,7 +165,10 @@ int __ref arch_add_memory(int nid, u64 start, u64 size,
        rc = arch_create_linear_mapping(nid, start, size, params);
        if (rc)
                return rc;
-       return __add_pages(nid, start_pfn, nr_pages, params);
+       rc = __add_pages(nid, start_pfn, nr_pages, params);
+       if (rc)
+               arch_remove_linear_mapping(start, size);
+       return rc;
 }
 
 void __ref arch_remove_memory(int nid, u64 start, u64 size,
-- 
2.26.2