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 43585C25B10 for ; Thu, 2 May 2024 08:50:34 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id CC4C96B009D; Thu, 2 May 2024 04:50:33 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C74BB6B009E; Thu, 2 May 2024 04:50:33 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id AC7D66B009F; Thu, 2 May 2024 04:50:33 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 8E1D36B009D for ; Thu, 2 May 2024 04:50:33 -0400 (EDT) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 4531680A30 for ; Thu, 2 May 2024 08:50:33 +0000 (UTC) X-FDA: 82072834746.23.2AD6CF5 Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) by imf22.hostedemail.com (Postfix) with ESMTP id 8C222C000C for ; Thu, 2 May 2024 08:50:31 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=WBgiw+at; spf=pass (imf22.hostedemail.com: domain of ryncsn@gmail.com designates 209.85.214.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=1714639831; 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=hRYCaxyc5VxJ2RJEf4Sa/SOe2k8+YTvkzKGpn4vzx7s=; b=ZEv4qb59EdUa3U5KA5NsaOXtKQPKbdvhuPgAjGu/6baxy8tqEaHfUR8MfAeN8WXMy2uqh6 yYyx8uj3vUg1nLsB8caujD3OncZtKIhsmf0ck5oPysPpDu+hvpc0ug0+TgMMpYgZtU0WEx 4BNJuIwP77bhHmnlAs/ko5XCRfRLRC4= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=WBgiw+at; spf=pass (imf22.hostedemail.com: domain of ryncsn@gmail.com designates 209.85.214.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=1714639831; a=rsa-sha256; cv=none; b=oqPhb7NS9YT4jD5vcuLXdEk9vLkSn/6PXezWniyuZ2rSAIjf8lStRyWqDodwOCp5IZ47/K QGt0w1wMutPnu9m0Im9xqri5c5GHxccS3poTKPJM52Nd29nmeAr0EW0Fz0VNc0WEveRsnS rFMCUgT75STy8fnWwnWIRi1Nat6E6kM= Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-1e651a9f3ffso39782805ad.1 for ; Thu, 02 May 2024 01:50:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1714639830; x=1715244630; 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=hRYCaxyc5VxJ2RJEf4Sa/SOe2k8+YTvkzKGpn4vzx7s=; b=WBgiw+at0cnrgOA3nOVRRX9wJvaAaimXgKQ9mR2UyfHyoFOPJPaQfGOCcbNVdgdot/ /f+9mSnEB6tNlwlY0AG98ta0LNN7J41V3sMoPi99jld8Wrtj81QAYtHGDTVsBQEjSRNE x6zQbfdLvGrRkax7r/vu5khjzUJRCP/Zl8lChiZ+RcW4xoDFwiRI07ibsq+McQBBNHPC XPgzSDcuzLIsKBAXjzs0lFSj+rjfTuh6pURfmMqZ0suNne0WB89HlXXq2SIRVvQmFbpY 2uACsTk/i3OG7BFDD0JzK2PqqexFo1u7hws/Cp8nXD1gxmnEzJbLAH3egRAH+Nf18uDb XxXQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714639830; x=1715244630; 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=hRYCaxyc5VxJ2RJEf4Sa/SOe2k8+YTvkzKGpn4vzx7s=; b=n/5nFcEks5SmITT5aU9zdUZArUPBpLYK9IGbguKXlNLE7xHZ1HUgv5KCsUF/c+xPdP dnbU56XgMsb+puWEClplPMNjRClIdBTU9lNSG4Yu4RBnB01g2u8WENgeUNZvgsKSMb5s CGiGT+zTcTUsL1/qc39s5drIUSwK40zN13HL8ICD6X8zBAkLGLnXcxBlTF54vBqNXbp5 5y3RMCTrMYN26N7Vf0NhUbXwAh+zdpLAHQH3i4LwS6TYnWbQvx4K/Mx7S2Y2z2yH4DhE 3XDTR3TYflFesgjVcE+n6UZVR0oFz1BLq7K6aiyaxqMU/J39jeakLU1laEjdJshnf2GX JOFw== X-Gm-Message-State: AOJu0YzXjgfjCQzZFdSKEvUBkb0EuzBkt1BbK1tBllEcPWHzePcJZ4Sj pFdHNroUTYs+ps9eOTwykjRRQ0fqZ24FYlhbA3ey0PV+GCUOQLsk0Kw5qKD8P6c= X-Google-Smtp-Source: AGHT+IHufI+b2KEWe7q4ZEgCWkfvkErjirIAQy1x6ZDt9+l/U2kkILUWyLVdHUQcPqggeeFX9lCXKQ== X-Received: by 2002:a17:902:c3d5:b0:1dc:a605:5435 with SMTP id j21-20020a170902c3d500b001dca6055435mr4637953plj.31.1714639830052; Thu, 02 May 2024 01:50:30 -0700 (PDT) Received: from KASONG-MB2.tencent.com ([1.203.116.31]) by smtp.gmail.com with ESMTPSA id j12-20020a170903024c00b001e43576a7a1sm737712plh.222.2024.05.02.01.50.25 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 02 May 2024 01:50:28 -0700 (PDT) From: Kairui Song To: linux-mm@kvack.org Cc: Andrew Morton , "Huang, Ying" , Matthew Wilcox , Chris Li , Barry Song , Ryan Roberts , Neil Brown , Minchan Kim , Hugh Dickins , David Hildenbrand , Yosry Ahmed , linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, Kairui Song Subject: [PATCH v4 10/12] mm: remove page_file_offset and folio_file_pos Date: Thu, 2 May 2024 16:49:37 +0800 Message-ID: <20240502084939.30250-3-ryncsn@gmail.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240502084609.28376-1-ryncsn@gmail.com> References: <20240502084609.28376-1-ryncsn@gmail.com> Reply-To: Kairui Song MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Stat-Signature: 8m565jm9yyyg311f1a85t73q1rhqqs16 X-Rspamd-Queue-Id: 8C222C000C X-Rspamd-Server: rspam10 X-Rspam-User: X-HE-Tag: 1714639831-534526 X-HE-Meta: U2FsdGVkX1+i+v8n/l/OtU0zSiSUOGjNkst7a7sGSBbHomjtO+m0mCQ4/YBb8Wfma3M7KeHW7Y4iI3b5UjS/RmzbF6mQDC/P6j8l/jLk2S/3R763IS3oIYSXiGWPa1gMtH/GRyoQ6f71Ppn+XEtmeQycjWzsVFYkT2mERz/HINmpcp4Cb1am+hV8tXGhfeiNb6ABXGxJYL25EuadYzesk/Q5JtdbxsqHR3al2bA24gVL/jPw+yBHZP2IG17kEA9EvNVrAF8DrNoWQG6hQd+7ih+N3gW1h6Q/CmGvnOd+RYsSHm4mWtL1UP7X46OXxxVsVWOf5mWfPloZPE38+SzyF5Q80KzTxT6ZhouiCpwpC9OtzGQW3iVxd2fSY42hV3evaJ0rm/F6hMnG6XGDC5ocjW1hWIofFhrPh1CLNRLCksZTNKIkK0ucJ2tLrsP9g1P9Dh6YHJW6+UPX6WjfUVa2nV0AmFj1aSPRb+zYgqdVDb1IvetDgz7lFoOuplrFAGpicWwptnNfHFqpolimMNvDZppgDZk2TEL+U5CR7Yxs1BiDv/ubqWVUHllInyxlv58iVLMVFLGv5NoMlhTRCWh/YLTHbu6ikMdY2ML5T5/TnbCaOpPx4R7aC3xvZcVJDEVXxg0RMZ9jwxqw1h1C5JY56Cl+RIB20We4Y0NceDBtoxZOhCxXzmw9xPzK4Fzl3lYTPaBr4B8n4jDwRBkPpN3ZGWacbsWbgJaRFlUHuGCCFGMtpzJRICVnS+Yb9BNgO6+8yZKr1SpgUbi+/ApyyDhrqEHLZT9M/odMbiasUVRkX4JIQpBtoh3xEgoVXm/v3mUqBo28tTIDTMSCbOX/LXiSD6hbLoM/Sh/oy9BLVqWWHLsxJRSiPRAJviTOtbUq6btKYTk+4UFXT0atV7YeWyXTxVhJGY2xKEJZIDejaGtCoHTZTx+WpoTLa3ZBxtI4EJ04L3tsZNlZXGqc26YjVFc dRLTMKlo byg2xTfZxEmz62B3F8wr8989u4MmtzDMQ2mzgYs+DSxOVkdl9nH2/1oUEwkW2fUJii42KNzY73vnhhR3ChaK5grQeKVqrzamHubdI4/u2iZkS0I0SlcEjfdlo83Jw+VYfQBi86gzrVf8tgsdg3pW2jGl9jzcMPnHrUltrFz6pWXXCIH+WISNbD6cpT2OMBPsHIYwTFUZ0kPbL53Si3qd84GWrwZ3AjAueWTirj2Cs8Y01L1r6KiBkKH5h3RuEFA4xdn3iMJCf96w/nCcttuYH1XHbREzhpc7MQXCMm7P4sWQzgvyEprCcOZk7+g== 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 These two helpers were useful for mixed usage of swap cache and page cache, which help retrieve the corresponding file or swap device offset of a page or folio. They were introduced in commit f981c5950fa8 ("mm: methods for teaching filesystems about PG_swapcache pages") and used in commit d56b4ddf7781 ("nfs: teach the NFS client how to treat PG_swapcache pages"), suppose to be used with direct_IO for swap over fs. But after commit e1209d3a7a67 ("mm: introduce ->swap_rw and use it for reads from SWP_FS_OPS swap-space"), swap with direct_IO is no more, and swap cache mapping is never exposed to fs. Now we have dropped all users of page_file_offset and folio_file_pos, so they can be deleted. Signed-off-by: Kairui Song --- include/linux/pagemap.h | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h index 850d32057939..a324582ea702 100644 --- a/include/linux/pagemap.h +++ b/include/linux/pagemap.h @@ -918,11 +918,6 @@ static inline loff_t page_offset(struct page *page) return ((loff_t)page->index) << PAGE_SHIFT; } -static inline loff_t page_file_offset(struct page *page) -{ - return ((loff_t)page_index(page)) << PAGE_SHIFT; -} - /** * folio_pos - Returns the byte position of this folio in its file. * @folio: The folio. @@ -932,18 +927,6 @@ static inline loff_t folio_pos(struct folio *folio) return page_offset(&folio->page); } -/** - * folio_file_pos - Returns the byte position of this folio in its file. - * @folio: The folio. - * - * This differs from folio_pos() for folios which belong to a swap file. - * NFS is the only filesystem today which needs to use folio_file_pos(). - */ -static inline loff_t folio_file_pos(struct folio *folio) -{ - return page_file_offset(&folio->page); -} - /* * Get the offset in PAGE_SIZE (even for hugetlb folios). */ -- 2.44.0