From patchwork Mon Feb 17 19:20:08 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Matthew Wilcox (Oracle)" X-Patchwork-Id: 13978545 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 0CEC5C021A9 for ; Mon, 17 Feb 2025 19:41:45 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 89847280097; Mon, 17 Feb 2025 14:41:45 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 821F4280098; Mon, 17 Feb 2025 14:41:45 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 739A1280097; Mon, 17 Feb 2025 14:41:45 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 51C756B00B3 for ; Mon, 17 Feb 2025 14:41:45 -0500 (EST) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 0F24A4B95C for ; Mon, 17 Feb 2025 19:41:45 +0000 (UTC) X-FDA: 83130456570.03.CAA5CB8 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf02.hostedemail.com (Postfix) with ESMTP id 2601B80004 for ; Mon, 17 Feb 2025 19:41:42 +0000 (UTC) Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=rJri8FlG; dmarc=none; spf=none (imf02.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1739821303; a=rsa-sha256; cv=none; b=IJc93WCAyaAiKN0tnUuOflIiRwGRGIZtM2/DtZTYmrO9XSMH8nQD7wuXcwvnvOEtR+zmIf Lp0YalE5p6Gi2/uqWPzfg3HxuAXsQq1LLlLbI1BWknLtR7ph5TWS0OMZQut4SeJu5Pt+sG ZFbWfgnlHC3/STZeZ3tagt+7ZFKSajM= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=rJri8FlG; dmarc=none; spf=none (imf02.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1739821303; h=from:from:sender: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=BFsH9QAI2na8Ehr8EVKOMkw6rcymXneSI8UT5C9tTyE=; b=Z7J+xJ7HAw92CC94CjAsP2Yx3EKKEBwdiE+fviTciQgxMEs9QZYnYzkqQLhtX8mdIZc2Ar wKRNIz3bNcP0zijUeICsT8ex1/aszXyWWpA9kMNPu/1GHMli98U1wNOH6VHasqfoEJNuYF dgJS1HLxsKoMbcRbw+6TDmWVSZP1/As= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=BFsH9QAI2na8Ehr8EVKOMkw6rcymXneSI8UT5C9tTyE=; b=rJri8FlGfREkB95xC59cKRmfff 95KyKR06lfzicmDOIR8qvngWjrFlT2V0rTWZi9hO8lsqsqMrMPa8UckoR4EMxhIRda0NNFxP8IQmt n0hzkG3hTShqFPrw6t1yH2511bRMlGGRPcX3e0GlD4aPdplTXwys0jiYJtn/2bgx+MChCorN0RxcQ l5xzqdsyyNIJPHY62YEW6XF6par9rT/TiyluLWLLnGuOXTmdbx8XoMP5o+UJOJksyywYQNyShUtKV gmKgsSVxFnTH49UJKn4sqpaiUlqSFKk643/lRUqJQqLKAg11hu1vATJrDEUrdJiTsrHg4cp49qFvo 2AfmUeIw==; Received: from willy by casper.infradead.org with local (Exim 4.98 #2 (Red Hat Linux)) id 1tk6f5-00000001pvZ-310X; Mon, 17 Feb 2025 19:20:11 +0000 From: "Matthew Wilcox (Oracle)" To: Andrew Morton Cc: "Matthew Wilcox (Oracle)" , linux-fsdevel@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH 3/3] fs: Remove folio_file_mapping() Date: Mon, 17 Feb 2025 19:20:08 +0000 Message-ID: <20250217192009.437916-3-willy@infradead.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250217192009.437916-1-willy@infradead.org> References: <20250217192009.437916-1-willy@infradead.org> MIME-Version: 1.0 X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: 2601B80004 X-Stat-Signature: hnmkc319rs4158hsowqyzik7w1su1yrw X-Rspam-User: X-HE-Tag: 1739821302-663962 X-HE-Meta: U2FsdGVkX19WKOufWxDjz/5XrNw5aHABvxd3cX7xlQNteIV3eorTrUqT3wNCwrbGezqY0yn7epD/EZIgXLE3LujPbI2Jld6Xu+uu9KDC+SvzUYLt5PzM0AaY11LWRYNZH05eP2vBa9iSXA8hVxazWRU8SZUvhFMsh9JIeHBSxMDSwSjRRmSUrgVwcbKeA7ZVpvw5HgDk8rPPMKI2uLw9BQcDqpZEGK0wosACfrNcrqFYjjENfnaK9a9yykrMvZbwiPxi+aly4ibTWO9GlqHukBj8OORG/HHt0342k/lPhvv8ckrQtT7SYYLZEeN1p300AhidwaQFNky90SqksmzURVvs4zCdRdFH94SMUzxJ4tkBCyDvNI3gN1MVRttFP/iZl/B+HZCx3KuAM9MDSqz6RZR7hIDyj1Nq/chOwucGN0GA5pCtL/XVANoa1HdHq7jf2gQuZGW43v/YaSvH9BodOz71vGDJcpBa4JlvzTUO1Wk70wkNLqDdfd5nBIijFQlkgEkGz5rNXl19iTsuyKP9LsM1ByMGoYGk0OSBWdmMgco+syNDxbkyzriXbogdNxGFyny8t8nY7WRMftY/BBELN+ZoPCrDYHP0Lkmnl1swdJF4qUv3/CFSNM8f7PuNMDlkJ8vz20/HAnRsPbGhp3c+oA/gC+bAVWVRpqjMGvGwqQL/BZQnUIBjrAzojwqk24KHwUsFrktV6BsW0VVTtsGVgFclg+TQfiJuxnAhd7MOufaqvHr9Bkz3vHySSuhAANg+ErP34lU1CVwYVcn+WENdqVxi5pz17wTmiKZweFSRGHbxdD/l0x5nc0KCooEaHLu2peXcRVYebNNKMFrYw0h2YZ+Zym3PmEC39lOwSdOTuHW0dmyVoo3q7i3gN3NWw6z2eBS7GNQMgRaBKqpxIIHqwYLnfkdA44cS11U2VhxUVE5ZKjmbMy4bgZ03OQNDJYzF9sh04gnxIy/pvrqVlif xXEWD+9b 2Vd5xWUrzRobSaYkgiT5018sw8DQvhipraQBCmzVOuWl+475PqJekQ7nRk7NR2aY6WSmQ7bLGnAa3xxp2/gBxR9XBiGJOMBQo8zHMOYhJmRptwZztssxcY2QsNTyKl2tGHcbnKeBtjJkj+jJOtJ6G7CAb4ZA3QH9PP5v/jLQKEtHkYY3PxHnAHgQEetIf7SYcynjN0+ysWHQ4/G1V8KdPmYRSjMwfA4OiRFhnI4oBHcuHOA80ubyhbqyNQcMnbnp2auKCcxGTBY59c7bCZi7er5975SJwPOMnbJTP 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: No callers of this function remain as filesystems no longer see swapfile pages through their normal read/write paths. Signed-off-by: Matthew Wilcox (Oracle) --- include/linux/pagemap.h | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h index 975c56fb4f85..ad7c0f615e9b 100644 --- a/include/linux/pagemap.h +++ b/include/linux/pagemap.h @@ -535,26 +535,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_file_mapping - Find the mapping this folio belongs to. - * @folio: The folio. - * - * For folios which are in the page cache, return the mapping that this - * page belongs to. Folios in the swap cache return the mapping of the - * swap file or swap device where the data is stored. This is different - * from the mapping returned by folio_mapping(). The only reason to - * use it is if, like NFS, you return 0 from ->activate_swapfile. - * - * Do not call this for folios which aren't in the page cache or swap cache. - */ -static inline struct address_space *folio_file_mapping(struct folio *folio) -{ - if (unlikely(folio_test_swapcache(folio))) - return swapcache_mapping(folio); - - return folio->mapping; -} - /** * folio_flush_mapping - Find the file mapping this folio belongs to. * @folio: The folio.