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 C2B88C369DC for ; Tue, 29 Apr 2025 11:50:46 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2D54D6B0026; Tue, 29 Apr 2025 07:50:45 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 286C66B0027; Tue, 29 Apr 2025 07:50:45 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 126AE6B0028; Tue, 29 Apr 2025 07:50:45 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id E27C56B0026 for ; Tue, 29 Apr 2025 07:50:44 -0400 (EDT) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id BC50D81149 for ; Tue, 29 Apr 2025 11:50:45 +0000 (UTC) X-FDA: 83386914450.23.04DC619 Received: from mail-pg1-f178.google.com (mail-pg1-f178.google.com [209.85.215.178]) by imf15.hostedemail.com (Postfix) with ESMTP id E85E1A000D for ; Tue, 29 Apr 2025 11:50:43 +0000 (UTC) Authentication-Results: imf15.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=Cqfg+gVB; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf15.hostedemail.com: domain of ryncsn@gmail.com designates 209.85.215.178 as permitted sender) smtp.mailfrom=ryncsn@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1745927444; a=rsa-sha256; cv=none; b=Be2b9lduT/BwtRDAO08/AZLOdQzWLeuXp08xaHR8xVNpDdkVgMsxrQRFn3HR59F6rHlddy l7wt15uS2HNACLv5SEgRWloNd+tPIJGifUqL+LvyNQsuFDYHY8qQVDRs2dcX54NeyROlcE BeKbpTWUl0b6wyR/toc+fc2xw8krrE4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1745927444; 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=1iyyLf3WUxORZOnWOPX6x4ocgIFr1IijLbgh6GePFQ0=; b=poLxkS5HNCp0JoJG4h6+Gtn7VrG3uPZo3nB7t3LDs1Qb3dUV94vwGWgwU0RTiS1uJXhHMU z0RTm0JtVua56NRAwwJtcv9NLDYuPgJyX2PYbnoIalU1eCa7PG1EtTGtLGr9Dpif6MjNtP JdcP9dPRfH3HB9mQdvkIMgN0gQN0NAk= ARC-Authentication-Results: i=1; imf15.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=Cqfg+gVB; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf15.hostedemail.com: domain of ryncsn@gmail.com designates 209.85.215.178 as permitted sender) smtp.mailfrom=ryncsn@gmail.com Received: by mail-pg1-f178.google.com with SMTP id 41be03b00d2f7-b12b984e791so5645943a12.2 for ; Tue, 29 Apr 2025 04:50:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1745927442; x=1746532242; 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=1iyyLf3WUxORZOnWOPX6x4ocgIFr1IijLbgh6GePFQ0=; b=Cqfg+gVB36gg2vFfQ2GEjjJD5jtP3Rg4Wc8FRs5GJgB0+LlA7AOYW1btfWGTrC6MFf 7QGtYVyK/xgOAhWxZPM2j1t6gs1cZ7xAXUCD2lJzIMn4sI8bcYRBamWkJxSbnNuR2SHy UCgYYi5CW4L57aX2y4vSwlhjEOLvt3uFN/9KbR5KBteljiP3jK2SixYV03SOsDPeLtG5 QUmwH/t7ARyEoKF4WUchNxeq0eV9ocd2RzQAqUzG6E1pd1UgsaDXG5/2UOlC14kfU7yI CpuJwUHydmU1zmldbESMSY2PE/5TNBnGIe8t8+zn2hN4ccir/y9uKh8Lg5GHWgreRcrr zj/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745927442; x=1746532242; 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=1iyyLf3WUxORZOnWOPX6x4ocgIFr1IijLbgh6GePFQ0=; b=M8uMZt97KCVP3uGfJUcp5AdyngBUL/RbMPSjfUKqijTmfyl5iohv75TUrsWcJHFKy6 C0e1eKDLADasLAqNRfgE7AQOXt4iQQwdTpx12/Q/CkK4hDLjJMXaQIyfPZe+hD0XYmmS Ki3jzo22/rh4+XXizBNZBtSj+bh5nQJZO7UBmax7Bt9+W1e6kvu18W9Ybv2qMB3IfiA+ qLaLMVcw5nDWmwqOtejkbIoFfiFAg8014Ut4bMJpNo2ODbdKI/1dP8vdNoWXxv7tTRnt nR4wOucdKn7b6VBVmj/ss/ccZeZgyOV64w798diHleYBbD58HcJ/r/+wVtLRU5I1oSJs +/5A== X-Gm-Message-State: AOJu0YzczA5OCYtvMR/r98+NZDI0wF8qllTH9yWvi20E60slZWPBEeww lTGwclpaz9M/MXGv8869JycKyoE4N0rJfJvI3pLQFc70x6jOQynWqxSFeTl9 X-Gm-Gg: ASbGncuswa/wwVOdfAnpLDwNS7QTShGeagga8CUu1Xx67ZEUJIIPzecRKj+fDgasSNS IKXPZDeyPfBHs1SyShGJ7WYr5z9GzCRGNYhTR6tbjx+lX0ZzjUC0++SMrxTiepHB9zRrG92yd+3 SemD7khVSv9IfLC7KxpIQxeKMj8lEjGZVhjteghTcYN3wm67YZyBzRo4Yg8jWUD40MlpLydyoq2 5P00mXdkl9iXTC5JjoZtLXhnj3IRIah1WBE2UnVa/p7+wzW7ZCzsTgYlwyxI6zbZ59mqcjUnPDJ JlYq7MKZEs4ppFN7idl14orciMAL3Fo5aHqoQPRJWsqC4ISoZdDxOPtBcXp0dVYHyQ8M5aE= X-Google-Smtp-Source: AGHT+IHGZrBDHK1WbkvwgRv01O0LY6RBxT8KjFbk+mC347HBJHKGCCEDSTjXjALIl+WfaCFQil4KFg== X-Received: by 2002:a05:6a20:cd93:b0:1f5:8d91:293a with SMTP id adf61e73a8af0-2093e528fa6mr4122901637.41.1745927442169; Tue, 29 Apr 2025 04:50:42 -0700 (PDT) Received: from KASONG-MC4.tencent.com ([43.132.141.24]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-73e25aca62csm9661644b3a.167.2025.04.29.04.50.38 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 29 Apr 2025 04:50:41 -0700 (PDT) From: Kairui Song To: linux-mm@kvack.org Cc: Andrew Morton , Matthew Wilcox , Hugh Dickins , Chris Li , David Hildenbrand , Yosry Ahmed , "Huang, Ying" , Nhat Pham , Johannes Weiner , linux-kernel@vger.kernel.org, Kairui Song Subject: [PATCH v2 6/6] mm, swap: remove no longer used swap mapping helper Date: Tue, 29 Apr 2025 19:49:49 +0800 Message-ID: <20250429114949.41124-7-ryncsn@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250429114949.41124-1-ryncsn@gmail.com> References: <20250429114949.41124-1-ryncsn@gmail.com> Reply-To: Kairui Song MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: E85E1A000D X-Stat-Signature: d6yuq8uqapyg9hwzdncscwhdrwe7bdsj X-Rspam-User: X-HE-Tag: 1745927443-899881 X-HE-Meta: U2FsdGVkX19L1pPfZXmebRzsokQ5tdlkTi86KbUwSH4imxOvgsn7u/LXNUf9b4dJ2UPVE8I7j3m0M4zA7aE+E42Ph+hkytfCrdXfUTpYMAoW1dezujsQiZfyzgeR8jIcxVjgSSu+tT3KW/XmXx5VCQM+ubDuwdLjBurgyK9OGilXGs7pRAbZoXw2OriSuKeazuIRC5piUKZ4T8kHDCI5w28bVttAvT+Unik2M+Q62+aOI5e9rHl/1IZ+M5uM/czQPki12XMMLh1ht56ETFPLP3CBGaZiKYurcMqWutZzsbXufCnpc3RRm/BBThN1C5qrUWErD1DsQiB+2KRZB9hNT3+TLkp6DaSt+hf3ECObvUDSaSPfnevSQvUtXGFCzPIUesSAOtgVVTwkf96CR6qqaRrQhcPnC4XO+o39sI7cQcXAPrpONDwKJsR12fHE0fly+UQk8NjDSp0PrEjoqxCXa37u2X67S+ZZgof76fPm4G00nOC8vrPqi2ofeTe5Fnvy+AX1C85i8NXtJLriIxsc6RAddx5fpdajrExnGu03YxT020uF4zSbmNGg3UfFAJaMSHUSe1Aus9t3aXcmkLBrFnGvvSwLNvEzV/4WVgSmjHMRvAiuXBh1AL5YEGDNOTXPjdPPo2MIsKkfD9azer3blQFCIbCUU+jq4Tzq4eVPGQgOudL+NRFUS/LmAXhhOV2xie6xuBpd7Q0BafvpnRYzxvFb2P3RRHRZIUd7fE9IiSa6YjUcM+Da58dc2HIIb0VNWsAUYXEueQZZLt5V2zB8RBRVqCpvQjC5F37QXSyvRdGbLfZbWir6PbMhpVkLS0SpUKzmro7BaB042n/+ljCKKregwoeYCz1aVJ90oM4lR6VLPQ28L3rPJjt31NM3uNLM5LFX4ziY9xJvrr22XLo2C8K6rNnFxH//bGLkKmiVyZeXct4P6R76536j8J52egDCoc4jmO/NhVQvfnfeNyA SCQc2S+G 1GQk5/GnIlg828LigplzWIClOAVVC1Ijg4n8ew/44A6eE2aHzL5o5dDn32XScMxuyNCzoLUlxdAnp8FaAE4W+Q+elTfcC0TtyEgy6DHWxaAQ9/XUAtQG9ukP73irEgWujSjmwZacCrJULiZj8fPushCcKCvLwTgkXYYIuDTFDGFrRItfpcSlrROs2aYmYgfNiFpWF15/bLplQiylOOZGEp+76FUWb0Fj4Drz99hD03v5Zg6YdsL7+UPZ131pmLwF7ZN6K5xmEoRz6V3DHkRsZIm/4q12GnAFaFdvJTilc/lbzRFK+mpzO0gZFy8UjDOjsaSZMZBstyHBl6mImLKbj4ATkowbdyZxszKtOc1sfWuYBiTj1P3BjPusxapeCmTcl+gks0oE72foj5/OQ3SyOpmZVjId3VKPBt8/LLBoD+kZuKZSReN6TNSCVytR0Db00oxJdTTZPg2OiMUZr/YZBc0VzFUmvvYyfYsVldhyE7Kwj+XgQ1+/HwxMPy9BMuIN1vzl4weFtjOUyB0SLttvEiR9cZLs0JeI2m8AG9U73ftcU3jmWVJO2OHGgYIk2bb3/txE9tgOaPkC0IQRNfliTUPzxsK5z6111fUcH50M6z9MOAQGnqWVN1ZlM1JG2QPLfmNoZ 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 since commit 0d40cfe63a2f ("fs: remove folio_file_mapping()"), remove it. Signed-off-by: Kairui Song Reviewed-by: Matthew Wilcox (Oracle) --- 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 47b5746d5a65..a071cdc8f902 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