From patchwork Mon Jan 4 16:17:31 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vitaly Kuznetsov X-Patchwork-Id: 7948601 Return-Path: X-Original-To: patchwork-linux-acpi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 03C21BEEE5 for ; Mon, 4 Jan 2016 16:18:05 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1E0052035B for ; Mon, 4 Jan 2016 16:18:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 266DA20117 for ; Mon, 4 Jan 2016 16:18:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752516AbcADQRr (ORCPT ); Mon, 4 Jan 2016 11:17:47 -0500 Received: from mx1.redhat.com ([209.132.183.28]:60926 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751986AbcADQRo (ORCPT ); Mon, 4 Jan 2016 11:17:44 -0500 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (Postfix) with ESMTPS id 55DAF96EF; Mon, 4 Jan 2016 16:17:44 +0000 (UTC) Received: from vitty.brq.redhat.com (vitty.brq.redhat.com [10.34.26.3]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u04GHXS4000788; Mon, 4 Jan 2016 11:17:41 -0500 From: Vitaly Kuznetsov To: linux-mm@kvack.org Cc: linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org, Andrew Morton , David Rientjes , Tang Chen , Naoya Horiguchi , Dan Williams , David Vrabel , Igor Mammedov , "Rafael J. Wysocki" , Len Brown Subject: [PATCH v2 2/2] memory-hotplug: keep the request_resource() error code Date: Mon, 4 Jan 2016 17:17:31 +0100 Message-Id: <1451924251-4189-3-git-send-email-vkuznets@redhat.com> In-Reply-To: <1451924251-4189-1-git-send-email-vkuznets@redhat.com> References: <1451924251-4189-1-git-send-email-vkuznets@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Don't overwrite the request_resource() return value with -EEXIST in register_memory_resource(), just propagate the return value. As we return -EBUSY instead of -EEXIST when the desired resource is already occupied now we need to adapt acpi_memory_enable_device(). -EBUSY is currently the only possible error returned by request_resource() so this is just a cleanup, no functional changes intended. Cc: Andrew Morton Cc: David Rientjes Cc: Tang Chen Cc: Naoya Horiguchi Cc: Dan Williams Cc: David Vrabel Cc: Igor Mammedov Cc: "Rafael J. Wysocki" Cc: Len Brown Suggested-by: Andrew Morton Signed-off-by: Vitaly Kuznetsov Acked-by: Rafael J. Wysocki --- drivers/acpi/acpi_memhotplug.c | 4 ++-- mm/memory_hotplug.c | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/acpi/acpi_memhotplug.c b/drivers/acpi/acpi_memhotplug.c index 6b0d3ef..e367e4b 100644 --- a/drivers/acpi/acpi_memhotplug.c +++ b/drivers/acpi/acpi_memhotplug.c @@ -232,10 +232,10 @@ static int acpi_memory_enable_device(struct acpi_memory_device *mem_device) /* * If the memory block has been used by the kernel, add_memory() - * returns -EEXIST. If add_memory() returns the other error, it + * returns -EBUSY. If add_memory() returns the other error, it * means that this memory block is not used by the kernel. */ - if (result && result != -EEXIST) + if (result && result != -EBUSY) continue; result = acpi_bind_memory_blocks(info, mem_device->device); diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index 92f9595..07eab2c 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -130,6 +130,7 @@ void mem_hotplug_done(void) static struct resource *register_memory_resource(u64 start, u64 size) { struct resource *res; + int ret; res = kzalloc(sizeof(struct resource), GFP_KERNEL); if (!res) return ERR_PTR(-ENOMEM); @@ -138,10 +139,11 @@ static struct resource *register_memory_resource(u64 start, u64 size) res->start = start; res->end = start + size - 1; res->flags = IORESOURCE_MEM | IORESOURCE_BUSY; - if (request_resource(&iomem_resource, res) < 0) { + ret = request_resource(&iomem_resource, res); + if (ret < 0) { pr_debug("System RAM resource %pR cannot be added\n", res); kfree(res); - return ERR_PTR(-EEXIST); + return ERR_PTR(ret); } return res; }