From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A0176C43461 for ; Tue, 18 May 2021 13:54:07 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 4228161184 for ; Tue, 18 May 2021 13:54:07 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4228161184 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=huawei.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 407328E0023; Tue, 18 May 2021 09:54:04 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 385206B012A; Tue, 18 May 2021 09:54:04 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 24CC46B012B; Tue, 18 May 2021 09:54:04 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0171.hostedemail.com [216.40.44.171]) by kanga.kvack.org (Postfix) with ESMTP id DED516B0129 for ; Tue, 18 May 2021 09:54:03 -0400 (EDT) Received: from smtpin24.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 76A3B180AD830 for ; Tue, 18 May 2021 13:54:03 +0000 (UTC) X-FDA: 78154495566.24.6500464 Received: from szxga05-in.huawei.com (szxga05-in.huawei.com [45.249.212.191]) by imf30.hostedemail.com (Postfix) with ESMTP id 7964DE0001AF for ; Tue, 18 May 2021 13:53:58 +0000 (UTC) Received: from dggems705-chm.china.huawei.com (unknown [172.30.72.60]) by szxga05-in.huawei.com (SkyGuard) with ESMTP id 4Fky8K0P3kzsRDD; Tue, 18 May 2021 21:51:13 +0800 (CST) Received: from dggeme703-chm.china.huawei.com (10.1.199.99) by dggems705-chm.china.huawei.com (10.3.19.182) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.1.2176.2; Tue, 18 May 2021 21:53:58 +0800 Received: from huawei.com (10.175.104.170) by dggeme703-chm.china.huawei.com (10.1.199.99) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2176.2; Tue, 18 May 2021 21:53:57 +0800 From: Miaohe Lin To: CC: , , Subject: [PATCH 1/5] mm/swapfile: move get_swap_page_of_type() under CONFIG_HIBERNATION Date: Tue, 18 May 2021 21:53:48 +0800 Message-ID: <20210518135352.3705306-2-linmiaohe@huawei.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20210518135352.3705306-1-linmiaohe@huawei.com> References: <20210518135352.3705306-1-linmiaohe@huawei.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.175.104.170] X-ClientProxiedBy: dggems705-chm.china.huawei.com (10.3.19.182) To dggeme703-chm.china.huawei.com (10.1.199.99) X-CFilter-Loop: Reflected X-Rspamd-Queue-Id: 7964DE0001AF Authentication-Results: imf30.hostedemail.com; dkim=none; spf=pass (imf30.hostedemail.com: domain of linmiaohe@huawei.com designates 45.249.212.191 as permitted sender) smtp.mailfrom=linmiaohe@huawei.com; dmarc=pass (policy=none) header.from=huawei.com X-Rspamd-Server: rspam03 X-Stat-Signature: 14r7ce5sfxakc6jkbgcp94mzpzj9x58p X-HE-Tag: 1621346038-530819 Content-Transfer-Encoding: quoted-printable 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: We should move get_swap_page_of_type() under CONFIG_HIBERNATION since the only caller of this function is now suspend routine. Signed-off-by: Miaohe Lin --- mm/swapfile.c | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/mm/swapfile.c b/mm/swapfile.c index 2aad85751991..4e7628b82e63 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -1137,30 +1137,6 @@ int get_swap_pages(int n_goal, swp_entry_t swp_ent= ries[], int entry_size) return n_ret; } =20 -/* The only caller of this function is now suspend routine */ -swp_entry_t get_swap_page_of_type(int type) -{ - struct swap_info_struct *si =3D swap_type_to_swap_info(type); - pgoff_t offset; - - if (!si) - goto fail; - - spin_lock(&si->lock); - if (si->flags & SWP_WRITEOK) { - /* This is called for allocating swap entry, not cache */ - offset =3D scan_swap_map(si, 1); - if (offset) { - atomic_long_dec(&nr_swap_pages); - spin_unlock(&si->lock); - return swp_entry(type, offset); - } - } - spin_unlock(&si->lock); -fail: - return (swp_entry_t) {0}; -} - static struct swap_info_struct *__swap_info_get(swp_entry_t entry) { struct swap_info_struct *p; @@ -1812,6 +1788,30 @@ int free_swap_and_cache(swp_entry_t entry) } =20 #ifdef CONFIG_HIBERNATION + +swp_entry_t get_swap_page_of_type(int type) +{ + struct swap_info_struct *si =3D swap_type_to_swap_info(type); + pgoff_t offset; + + if (!si) + goto fail; + + spin_lock(&si->lock); + if (si->flags & SWP_WRITEOK) { + /* This is called for allocating swap entry, not cache */ + offset =3D scan_swap_map(si, 1); + if (offset) { + atomic_long_dec(&nr_swap_pages); + spin_unlock(&si->lock); + return swp_entry(type, offset); + } + } + spin_unlock(&si->lock); +fail: + return (swp_entry_t) {0}; +} + /* * Find the swap type that corresponds to given device (if any). * --=20 2.23.0