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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0C85BC369D1 for ; Sun, 27 Apr 2025 19:00:33 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1191C6B0023; Sun, 27 Apr 2025 15:00:32 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 09FD46B0025; Sun, 27 Apr 2025 15:00:32 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E837B6B0026; Sun, 27 Apr 2025 15:00:31 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id C65C96B0023 for ; Sun, 27 Apr 2025 15:00:31 -0400 (EDT) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id CFC7F1A0BDC for ; Sun, 27 Apr 2025 19:00:31 +0000 (UTC) X-FDA: 83380739862.16.300D604 Received: from mail-pf1-f182.google.com (mail-pf1-f182.google.com [209.85.210.182]) by imf01.hostedemail.com (Postfix) with ESMTP id F352940009 for ; Sun, 27 Apr 2025 19:00:29 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=LD+noHPE; spf=pass (imf01.hostedemail.com: domain of ryncsn@gmail.com designates 209.85.210.182 as permitted sender) smtp.mailfrom=ryncsn@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1745780430; h=from:from:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=f4lipydBuOubJubR5kmo9nNBPLmCY7qckq6Qt0Bh+qw=; b=BKbNrnuWIGmB8kD6Ud109UYBzcUl6gILhIkFPULv3G+mx7H/ZXNHNKzIqpkTy5cEarEqw+ LEWna0Q+HXBPBfLt3rb4uFdgmvSi9pBDh/261OR6zcADvtoQxdT3yYleyPPYLZUUxnMvAF VBnU8HBUfVOJlkd6RoSZ5nkxLab0KtA= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=LD+noHPE; spf=pass (imf01.hostedemail.com: domain of ryncsn@gmail.com designates 209.85.210.182 as permitted sender) smtp.mailfrom=ryncsn@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1745780430; a=rsa-sha256; cv=none; b=VWl+tR7Tx5SNRqp1W4xui+CxA4G0bkHLNCTTIJuYYIiIILxOdA30JVOmbAePRdQtoRFp19 LM9aJNo80XW+/zwocqXVSbol7p7IfTi+ZkcGVX21jhtOGzgRT2OF908RDQe3HmqRzKnsU4 NBYmwPSw+RDhWiFFaOFgwGblwsFj+eA= Received: by mail-pf1-f182.google.com with SMTP id d2e1a72fcca58-73bb647eb23so3340876b3a.0 for ; Sun, 27 Apr 2025 12:00:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1745780428; x=1746385228; darn=kvack.org; h=content-transfer-encoding:mime-version:reply-to:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to; bh=f4lipydBuOubJubR5kmo9nNBPLmCY7qckq6Qt0Bh+qw=; b=LD+noHPEb4TZUSJX3KcbLf5q7DbPaNsIERaXxUrb5whaKmoZMY4ZEvPGwgrS2jSy6k INhgH8Yera6864+JaDO8+KW1AKAHYWoiMYAvB8A6Fv5oetZD554TDOfVbW80Z0pvbdGA z6aC7GwryFXu0XB8CrHHDOfSsG7J3Hy8noiOpZWDxaxQNN2ej9aT1664HiGQCwWQKoL0 5GFHkkFQBjrPhxXFka7M86Lrj7Qir8JTtRbvNPnMCbLyw294Hee4XmVl7HPqO9cvZELM R7SnW5f1AhfOEn609tsskGP2mwrM/mlN7ZILU/EyXaY3OWW824KLgMPMUQIKzuW7jyjt CTHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745780428; x=1746385228; h=content-transfer-encoding:mime-version:reply-to:references :in-reply-to:message-id:date:subject:cc:to:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=f4lipydBuOubJubR5kmo9nNBPLmCY7qckq6Qt0Bh+qw=; b=bF62BIM9Hj0tn7k8jUw31MtCfHgeedA52IaS5NMxpOcvGkIy5M4MUmKmk3LFFAqNGt qSVLbFfW+eE5bz40LrFDmMWV6CGheYYQNrMIQExZQiuvkmkTIoDHnh/goH6jME+3f+HS OwTmYxIfQkxPZSgq8KQ/6h4DvDB8f84qcbWrIfDHoAQ2gTxFPPlUkiM+WyswSsYCeLa6 swaRAuGwJ2BQTocKyDAewBTbNYa8bLDJUDlzIrebxgorMP1YTodR3eSA4QSSz4aFgrhS TuHL9CoMjqYmizMYVSJaQMrQ0L8tqmPCszTr+YyHw1YxRMHv4gO3irHHCEeUBfdRrkTk JwuQ== X-Gm-Message-State: AOJu0YxiSzaOEJCDwS8jw3SzrzHumTYnbNVo6N6JaXutjFo2CACnE98f cHPqHQyKG/4Vjf8v5/1mnhOJ9fIhWyTgleKLiNBhhHW1BrqzYSm/bHSdZXzmtW8= X-Gm-Gg: ASbGncsUjJoeg0kWQhN/NeSCKrQlLSizEZ+eXqBYdkN3hYSHwYd7ZA5LKW5B8cuGvyJ fwnUGVNzQEt4ZuUDMMebt3ylgjpaHbDqWlnFOke0Dd5gadfWO7wtr6tscLlTvkT4eJadJMUuKVL xBY3KPrL1D0t6kduZOBKuKZM8XCL53RmXlUbFSaL98gH2r53aQMlyEEvRyiuHAcStsrd3k0w5aV PtE/s/678tKTHPjnXP9VhJXQ5P4o90p3HuxfXQMJXCmSHwtUeSb81ssmFALDxHHRnGU+6AZJ1k0 L1QuMAqYb7YEKJi2ACi3psx2vk5ZJJW71x/4Qqeegr0rtFKihcVn1tbkW6JRfg9HuGofitbw X-Google-Smtp-Source: AGHT+IEojAV7wyacxqGiE1y25FLFORF046WjhVqXTWNSq4957oQpkciYstlz2WCGKQpwjcRVUqRcnw== X-Received: by 2002:a05:6a20:9d93:b0:1f5:8221:d68c with SMTP id adf61e73a8af0-2046a3eef47mr7803932637.3.1745780428327; Sun, 27 Apr 2025 12:00:28 -0700 (PDT) Received: from KASONG-MC4.tencent.com ([115.171.40.102]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-b15faded554sm5862153a12.72.2025.04.27.12.00.25 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sun, 27 Apr 2025 12:00:27 -0700 (PDT) From: Kairui Song To: linux-mm@kvack.org Cc: Andrew Morton , Matthew Wilcox , David Hildenbrand , Hugh Dickins , Chris Li , Yosry Ahmed , "Huang, Ying" , Nhat Pham , Johannes Weiner , linux-kernel@vger.kernel.org, Kairui Song Subject: [PATCH 6/6] mm, swap: remove no longer used swap mapping helper Date: Mon, 28 Apr 2025 02:59:08 +0800 Message-ID: <20250427185908.90450-7-ryncsn@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250427185908.90450-1-ryncsn@gmail.com> References: <20250427185908.90450-1-ryncsn@gmail.com> Reply-To: Kairui Song MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Stat-Signature: 66cdxk5mmxagw53p3tc46sho6w5xchnd X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: F352940009 X-Rspam-User: X-HE-Tag: 1745780429-187244 X-HE-Meta: U2FsdGVkX18EfPn9cs0iRRCVEZWeTEiuL18AtzMpzZXxhOiQobnyVog6/faAQTmojPBCQKhBPjlZherRB8ETWJIfBcqQrWw7asTMsdqOz2uqs/NNjAhCrHcLGhULrs4g4jhEo+1d+Xh+Uyxuc/6QlzGIKJSFngDp4mcafrY7EfUrydDZhwznpCV7CEX32+8LSHmuKHwabp7yiyXC4w03JaXH0Nj6kUCzhhsZ+1za77757/OnQ3qN1Pc2XG5o0/6IaeOfcU/SBK+6aARnZ4jCKJG83/a/gQ262aZJTcBZkpL1K2TXn3bMhKIWz9GjrXfToZu8B3WcViXLNozzJViDLVy9R9fI1vYfqg3HaMMTtgdZAaqhEemtecjOUWW4tpjZi84y3h5pbNLPEfeCFJXrt8t1/aD5pdSYp6jmX8mDTKIxh8eY+01qc7m/xtBefEiSOki49SWcyrheOj7TUAQqER0lpbOUSAudgju3zYXUwRFdl096ZHeA4k92w07QQELHHFXUVN/SEfIhPoxLV7mlAgygqSvlHqiTfnEZKxlJ4jvxt/8FK3jIvtuUeHJ6Lb1JVJr9THA/hTWBle8StY6464depQYxBj49wLhojF2+EoLOhWLFLg2akvzV63tyENzxPKNyBvpXu/GMLYj1q5t7s01z/F+u+11twJAp0lnkwf4E2l2WU1cZrtGstLblYJl4hmRG/gpyA6eEdwKCmL7lCHMCqSR3Ni5X7HZhWfsbq/V5sWgrRfakw1tckvS0ajURUxAoY9HkWXumDkX2SUvy+MJsdzORJVEoim1u5syrJrkVBLNKq0PtdOx5rZzIoF0bMMKxZpHFSil6R5Cu4vmwKkrZXgg6+KULw4Ig3t4Bn9dSOAU1qrU6yxW0x0/2sdSVzprahlfkjD4MDXJ1FDVcUVvBMEvJ4Hx4a3yZmh+VD7eExzwZoZLZFiPDbxs+ExNhD8KvQzeS4jc2dYLjEh9 P75bT8CK NdsprxML0i/nScGblVbSNz/AgNw5PORHmVjqUPCKsG4gtx2Mr2Jt+56phfjoDijXjDTNZWomPqdStMoxLMo3Li7n0hom0h5aZpk2EoZxfIS/E0Cl/qLxwqQ5iGyalRj9ILxUiAL+o/6pnuQBQqXj0M0Z2acGgbqyjYOWGnVr0kb6xCUmf5QiNxLRD0s8RAchhK4pz12OTOUr+UVPNAvY1CxWhAGoD2F9S765MBj7sBBI3Od7EMpK/P6PIZ2/sDohQH5cQJW+sA2kXBNk1xZxcuY0ODm/ZI2XHenKTGOui0kyNxQQzxvCif4ZMhiCTp7DTOZT2L2QSc9hUN4ZCRx2dPf9mpamY8byZjMVemZAT9L0DPTUXQtQpWlhkC9iNizEAaOVqIZ8+cLNlL4Z2j7wgDBVSEsYNK3YhTI5QghPtWRurQ0xVql44P3scIpLwPnRkqOL3swnZzOQwombfulZ4FCLBHcgwUW7cfxBJ+jcnC6KVq031ZULVP2ErldupSqE8bcYvPn1rx+HDo6368TFEBfJaQ1metHm2tXuj8s+R60gcHB7TqmSAsD7ikYaXiQ8Fbnzr 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: List-Subscribe: List-Unsubscribe: From: Kairui Song This helper existed to fix the circular header dependency issue but it is no longer used, so remove it. Signed-off-by: Kairui Song --- include/linux/pagemap.h | 1 - mm/swapfile.c | 9 --------- 2 files changed, 10 deletions(-) diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h index f61fdb8e165d..b27e369d8bd7 100644 --- a/include/linux/pagemap.h +++ b/include/linux/pagemap.h @@ -533,7 +533,6 @@ static inline void filemap_nr_thps_dec(struct address_space *mapping) } struct address_space *folio_mapping(struct folio *); -struct address_space *swapcache_mapping(struct folio *); /** * folio_flush_mapping - Find the file mapping this folio belongs to. diff --git a/mm/swapfile.c b/mm/swapfile.c index bf6c98009909..1a36e1f4f198 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -3653,15 +3653,6 @@ struct swap_info_struct *swp_swap_info(swp_entry_t entry) return swap_type_to_swap_info(swp_type(entry)); } -/* - * out-of-line methods to avoid include hell. - */ -struct address_space *swapcache_mapping(struct folio *folio) -{ - return swp_swap_info(folio->swap)->swap_file->f_mapping; -} -EXPORT_SYMBOL_GPL(swapcache_mapping); - /* * add_swap_count_continuation - called when a swap count is duplicated * beyond SWAP_MAP_MAX, it allocates a new page and links that to the entry's -- 2.49.0