Received: by 2002:a05:6a10:c604:0:0:0:0 with SMTP id y4csp637910pxt; Thu, 5 Aug 2021 08:08:16 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwhyWTPpys0FxR5AC6GMjCebBzGERiQgLbx/ZX00ZIaRDsMp1Honm83tFgRTX58phNcRybW X-Received: by 2002:a5d:96da:: with SMTP id r26mr2264208iol.47.1628176096137; Thu, 05 Aug 2021 08:08:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1628176096; cv=none; d=google.com; s=arc-20160816; b=HmZkxzdIrP+h2eH19FqNmry731QxTLakIiC5hXp3HK4PXYEWyhRcOcsJ9JbjFN5Rn1 0XTo8KKCV/bxeMROoEmO/cDl1DU/sZ1UJef7V8fdhUKEKuzDsaEmrlRYJ3XFp/6Exans SP53zLjryhEYW+vAihSXouVAWRciKeGqFI5rIsUVAZVu558rdzO4Kp8OL/3uKsqsax9B m9eAIaGG3/91wTurTxlDYr19jJ8SgMfus39E0znXoZEdzu7PUSUtbOVRcJds2v/72AXP aUZzmAyRXlMs3dNfTpNuS4l5h7hN5JDpEUqYkr8xoRTAVhE68ojfPJ0ml3ElyrICCVM6 NVIQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:references:in-reply-to:references:in-reply-to :message-id:date:subject:cc:to:from; bh=uq0WXS6wAVThwHE9KuzomsaROMDPOYp3mzO5ir+6+es=; b=DhYnOKiR2nYPaJNDoIsBFRh6+oTwXDUa7Rysc2uQp1U4Iq+lrxI2R1vKuS52L8D8uE oBDD92Ig8GKfEUFp+XG0U+442xRyPSdVWs+s8hzYBRXwiTltAjHWQ1vLm4Oh6GrEtg9U d/e+T/I2b/F1ZxiW7PH/F9DRM+B1t9tj99pbgfEXfEjkX+A9yLn/8Zz3eNvEIAnaKlk8 qP1huvw2Jst57HTBWV5gwjem65uz9mV4tknV/ZZRg8qpIgdXkQS3gQ3R7Hcq7u9LP+TV spNboI3IhyPnGiz20J/5Vr51+kxQn7YeRaOqoob0/FIUUGjKbPMmesJBoAjKw8CnPrQ4 EhVg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id a9si6325193ilr.103.2021.08.05.08.08.03; Thu, 05 Aug 2021 08:08:16 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241251AbhHEPGg (ORCPT + 99 others); Thu, 5 Aug 2021 11:06:36 -0400 Received: from out4436.biz.mail.alibaba.com ([47.88.44.36]:37871 "EHLO out4436.biz.mail.alibaba.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233228AbhHEPGf (ORCPT ); Thu, 5 Aug 2021 11:06:35 -0400 X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R811e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=e01e04423;MF=baolin.wang@linux.alibaba.com;NM=1;PH=DS;RN=4;SR=0;TI=SMTPD_---0Ui3FG-Y_1628175970; Received: from localhost(mailfrom:baolin.wang@linux.alibaba.com fp:SMTPD_---0Ui3FG-Y_1628175970) by smtp.aliyun-inc.com(127.0.0.1); Thu, 05 Aug 2021 23:06:10 +0800 From: Baolin Wang To: akpm@linux-foundation.org Cc: baolin.wang@linux.alibaba.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH 5/5] mm: migrate: Remove redundant goto labels Date: Thu, 5 Aug 2021 23:06:00 +0800 Message-Id: X-Mailer: git-send-email 1.8.3.1 In-Reply-To: References: In-Reply-To: References: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Remove redundant goto labels to simplify the code. Signed-off-by: Baolin Wang --- mm/migrate.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/mm/migrate.c b/mm/migrate.c index 0ab364f..ed74fda 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -911,9 +911,8 @@ static int move_to_new_page(struct page *newpage, struct page *page, */ VM_BUG_ON_PAGE(!PageIsolated(page), page); if (!PageMovable(page)) { - rc = MIGRATEPAGE_SUCCESS; __ClearPageIsolated(page); - goto out; + return MIGRATEPAGE_SUCCESS; } rc = mapping->a_ops->migratepage(mapping, newpage, @@ -949,7 +948,7 @@ static int move_to_new_page(struct page *newpage, struct page *page, flush_dcache_page(newpage); } -out: + return rc; } @@ -2095,11 +2094,10 @@ static struct page *alloc_misplaced_dst_page_thp(struct page *page, newpage = alloc_pages_node(nid, (GFP_TRANSHUGE_LIGHT | __GFP_THISNODE), HPAGE_PMD_ORDER); if (!newpage) - goto out; + return NULL; prep_transhuge_page(newpage); -out: return newpage; } -- 1.8.3.1