From patchwork Wed Aug 22 09:32:25 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oscar Salvador X-Patchwork-Id: 10572779 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id F2DAE112E for ; Wed, 22 Aug 2018 09:32:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E5C9D298D3 for ; Wed, 22 Aug 2018 09:32:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D95C52AAEC; Wed, 22 Aug 2018 09:32:44 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 79DA8298D3 for ; Wed, 22 Aug 2018 09:32:44 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E67916B23B1; Wed, 22 Aug 2018 05:32:36 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id DF9BA6B23B3; Wed, 22 Aug 2018 05:32:36 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id AEABC6B23B2; Wed, 22 Aug 2018 05:32:36 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-wm0-f71.google.com (mail-wm0-f71.google.com [74.125.82.71]) by kanga.kvack.org (Postfix) with ESMTP id 411B86B23B1 for ; Wed, 22 Aug 2018 05:32:36 -0400 (EDT) Received: by mail-wm0-f71.google.com with SMTP id s18-v6so1401802wmh.0 for ; Wed, 22 Aug 2018 02:32:36 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-original-authentication-results:x-gm-message-state:from:to:cc :subject:date:message-id:in-reply-to:references; bh=nxUagGrg5D666cpnIjgBZsQJk+sz7QTKW02cy3LKoaE=; b=W8XGLoWqilejIDGGUDtdYarW6hHOXNE8GSFN4H5Vi0e6ZcBXBESdKKh544Agg/UT9i EtHr4LGb/nOW2UG8d/XnVsqO9795SY8HfGE44VIKzm7CSynosk1BkUy7npt5026zXsnL x47yMNwmezk+XHcMB+yGq3aoz/JUSFpdlAdJTJ3cy3hJoixCiJ1Cz1TGh2ycdgVva15d vGuDKHYgai+aGL6QyCsKhxQZq7jpHIdh8tQ46TexK4D9We1xvzoQQFyZ0QZPM5IgBjNI AJcP3/xhuy1uMEFA0akUmjYtmV5gEbg9okX+0Z3ncghNNHtyuxE6wcT9QAgVEtCxernH ZMEw== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of osalvador.vilardaga@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=osalvador.vilardaga@gmail.com X-Gm-Message-State: APzg51BBfQvWxMpBhRH6O5L7jbDmszAZgeIJv/nHUFiG2S3aTrQ4NgrX a2z9Wtz9bXLArlsoQ1gbagL5hreLJavRzvFSwodIMKCBYHS+9Ac82Cg4eZcQaxOTuFq9881LYkq j3RQVLtot+z2eZRXqYco4G26vuVhILw1tVLoAWUfF/N0zIIAK4AnP5C43q+jlR3xBGe55vxJL60 JUmoxYD4z4LqBgez6JzbO8Xjtk3rGCi9WXU3QeIXdzdGG1nYBdS6F8fvJWE3hiR8az3RcHLiH5B 86GaUX3zYIAgn1vqYVUMBGng+6NYcsAkOLHe8Eq+2OAfiKqKmCkUTjSnML7YejGWdkM9q3Zi0Mh x2UjFQsbp0xYcuyEIz/Y/W/xS8Ut492/R33jxNIQJYqahUN2TnSpablx4gXCG1jMQRFD2A+/fw= = X-Received: by 2002:a1c:cc1a:: with SMTP id h26-v6mr1953489wmb.112.1534930355795; Wed, 22 Aug 2018 02:32:35 -0700 (PDT) X-Received: by 2002:a1c:cc1a:: with SMTP id h26-v6mr1953461wmb.112.1534930354912; Wed, 22 Aug 2018 02:32:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1534930354; cv=none; d=google.com; s=arc-20160816; b=uREf5sEhkBaIQwbhGNjeqEiTkUD0LSk/+1+nLdZxcxqf1CRkLRQzxy2s+GwzcSf20l 2kJ+KqKpZZKaQAv+FWAHALYaZQ84qkgbaCpThpfppeOGVot2eeffKu0XUpfClKWgpk3a ZhNKBgls6fWhgfOeAsVFXnDHbsdbs+SHgK454qZzcVnuw6hjCtAvzkQLeFuYubsDsvqy /0FSxXGzHareZIeV2TlcqtkeTwFnekD0iBfuneBQhim/paVX5xNgOhZt7fvj6h/ErSfk JIk35GP54ynD8oHngtwIQ72g2TXsQfDFBmLZAKvziRs7oP+1H5ioXh9JxR9uZKowmRYO flVQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=nxUagGrg5D666cpnIjgBZsQJk+sz7QTKW02cy3LKoaE=; b=X0ARXfo29QYTLUwqoetNRnebwHM2mPKDMpTd5kdPrav+8LVa5coG3BUtdBF17clNW/ WUE9eiMzVlRvEGlQ5zRapwf7SCnjzA+rReO7RO3P2smb8Kj0/b1Q/ZuI7NCjUmlXjowH UGdZ1Rs34fnA8TaGcA9iC0YZuo5JGAZJczQTeLEKLOOO7ojZEscguyuzaifNkwFrdBYE eoOIAt3u/EAH245lFzvLQfHHBmThmAZHdGYAex3ohzLY3im7pXWWQopCcIPUNl0ZoYzX voedheB03uuPVKnmUw8Q2j6qJk5fX8llw9TiJi0lHwCOTbuoEyKbHVCooVxNpCuJObpB lcWw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of osalvador.vilardaga@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=osalvador.vilardaga@gmail.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id g40-v6sor393760wrd.15.2018.08.22.02.32.34 for (Google Transport Security); Wed, 22 Aug 2018 02:32:34 -0700 (PDT) Received-SPF: pass (google.com: domain of osalvador.vilardaga@gmail.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; spf=pass (google.com: domain of osalvador.vilardaga@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=osalvador.vilardaga@gmail.com X-Google-Smtp-Source: ANB0VdYF/NAGu5c3hvht6sSSFszgiUORPgrM7HTAMBTHGwg8K6Fg51jSrRQF6DXfaHH3XTD2dxlrKA== X-Received: by 2002:adf:b609:: with SMTP id f9-v6mr6051323wre.14.1534930354670; Wed, 22 Aug 2018 02:32:34 -0700 (PDT) Received: from techadventures.net (techadventures.net. [62.201.165.239]) by smtp.gmail.com with ESMTPSA id 144-v6sm2290164wma.19.2018.08.22.02.32.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 22 Aug 2018 02:32:33 -0700 (PDT) Received: from d104.suse.de (nat.nue.novell.com [195.135.221.2]) by techadventures.net (Postfix) with ESMTPA id 992EF124A16; Wed, 22 Aug 2018 11:32:31 +0200 (CEST) From: Oscar Salvador To: akpm@linux-foundation.org Cc: mhocko@suse.com, dan.j.williams@intel.com, malat@debian.org, david@redhat.com, Pavel.Tatashin@microsoft.com, linux-kernel@vger.kernel.org, linux-mm@kvack.org, Oscar Salvador Subject: [RFC PATCH 4/5] mm/memory_hotplug: Tidy up node_states_clear_node Date: Wed, 22 Aug 2018 11:32:25 +0200 Message-Id: <20180822093226.25987-5-osalvador@techadventures.net> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20180822093226.25987-1-osalvador@techadventures.net> References: <20180822093226.25987-1-osalvador@techadventures.net> X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP From: Oscar Salvador node_states_clear has the following if statements: if ((N_MEMORY != N_NORMAL_MEMORY) && (arg->status_change_nid_high >= 0)) ... if ((N_MEMORY != N_HIGH_MEMORY) && (arg->status_change_nid >= 0)) ... N_MEMORY can never be equal to neither N_NORMAL_MEMORY nor N_HIGH_MEMORY. This is wrong, so let us get rid of it. Signed-off-by: Oscar Salvador --- mm/memory_hotplug.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index 0f2cf6941224..006a7b817724 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -1564,12 +1564,10 @@ static void node_states_clear_node(int node, struct memory_notify *arg) if (arg->status_change_nid_normal >= 0) node_clear_state(node, N_NORMAL_MEMORY); - if ((N_MEMORY != N_NORMAL_MEMORY) && - (arg->status_change_nid_high >= 0)) + if (arg->status_change_nid_high >= 0) node_clear_state(node, N_HIGH_MEMORY); - if ((N_MEMORY != N_HIGH_MEMORY) && - (arg->status_change_nid >= 0)) + if (arg->status_change_nid >= 0) node_clear_state(node, N_MEMORY); }