From patchwork Tue Apr 23 22:55:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wilcox X-Patchwork-Id: 13640867 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 87BD5C04FFE for ; Tue, 23 Apr 2024 22:56:08 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id ED3186B018F; Tue, 23 Apr 2024 18:56:07 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id E83ED6B0191; Tue, 23 Apr 2024 18:56:07 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D729D6B0192; Tue, 23 Apr 2024 18:56:07 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id BA2D36B018F for ; Tue, 23 Apr 2024 18:56:07 -0400 (EDT) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 5641B40138 for ; Tue, 23 Apr 2024 22:56:07 +0000 (UTC) X-FDA: 82042306374.18.EB6F4D3 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf19.hostedemail.com (Postfix) with ESMTP id BB69E1A000B for ; Tue, 23 Apr 2024 22:56:05 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=VPD3YkPl; spf=none (imf19.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1713912965; 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=KYDG6ZsjDj+2iBPQ3OajYlgseuthmwTxF2D+L3YSI+w=; b=SDUO8GEK0ZzqhTXrR2URKOmP/5zcZ/qI7jQ00Tf/eGrWYMRyWHLCyfDJ6X+UuSnzOx+69S P5GPMLaLAzwF4+7QYC16GeJ+bj+tkfhbWtkce97gjQSBf8rzsieyxunO6ey+zuvFbkBUx3 HtasN/nA7DnBKlLvbvyFaYj4xGFjEwo= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=VPD3YkPl; spf=none (imf19.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1713912965; a=rsa-sha256; cv=none; b=cHOvKsrLQhdQL6BuJFxwtu10UfLv2M7EW0wQRrE9Ery6r4PwsHW04vDOAWAq5p5UXgw2LK TTv48wx6WagH7a1zIWQPyFd6rWd9s3x5CFAPeqQwgGrMruVfcZ59kiZ2nFRxdtWS3WBmfz XNK0B1PSEfgAYVTuLvg4HE6V9z6pnLk= 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=KYDG6ZsjDj+2iBPQ3OajYlgseuthmwTxF2D+L3YSI+w=; b=VPD3YkPlOZgK3F00x6rBjyB/qa 7iLvl71KcyySOFpXv6VNcIvJ4kLBFTS/SXC3ZzrjOZBGWVSosHva8VS0O89ku2EGoSb9qZG20yWz2 gsbxrWVoRLITZhb+GHv47Fr7Tcbg/hDcEGYqKicULJLqtr7/WQI/SbIVuXP87EClD4lburQZ8Bn0E 1sENDUkd5HyuQEQA7bd59fijov3p1eibLXaD65uZE4xl1bPmqZpVd8Bz2kpemDPimf7xp4wYx1Bts biZFYcGHus1s7W3aAtQd9JEgMLwAi1M2Q51JgD2jB+d0NH8QBSQz+8Dfe99630W60Xx6+tpx6+3jk Cq8mW83A==; Received: from willy by casper.infradead.org with local (Exim 4.97.1 #2 (Red Hat Linux)) id 1rzP3K-0000000HG6G-1bIa; Tue, 23 Apr 2024 22:55:54 +0000 From: "Matthew Wilcox (Oracle)" To: Andrew Morton , linux-mm@kvack.org Cc: "Matthew Wilcox (Oracle)" , linux-fsdevel@vger.kernel.org, linux-fscrypt@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net Subject: [PATCH 2/6] f2fs: Convert f2fs_clear_page_cache_dirty_tag to use a folio Date: Tue, 23 Apr 2024 23:55:33 +0100 Message-ID: <20240423225552.4113447-3-willy@infradead.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240423225552.4113447-1-willy@infradead.org> References: <20240423225552.4113447-1-willy@infradead.org> MIME-Version: 1.0 X-Stat-Signature: eb8sgnt7y416eens5iy65y9drjaouid9 X-Rspamd-Queue-Id: BB69E1A000B X-Rspamd-Server: rspam02 X-Rspam-User: X-HE-Tag: 1713912965-246251 X-HE-Meta: U2FsdGVkX19pKBiZntNZXRTdmljY9025PBr8UUUyv2euWi1MpmkjBskNOkREJG2roUpI3tepPgMBe6GRiaMWmhRh+asHdgmjkjNj99Ug7h3YaWq9uhn4tI8MA0pWdjYo7w+WwQHChcEBEa9Biq/KN66nBqsEhCE+Xm6V+aB7mtkyUlVSKT3Y0Pqc519ybvEc9JaLHY4Wso5aUm17WuMLkVjGgbPLQA5v4wj5H/Q/OBgy0EX1OaNkVnXXpB1bvyKqkwIUwsdAC1iM2/GnrFOBVb6HV2lMzW/4kZUWbRYt5KaPZ6nLBVYFiivc4DPtyxz8Xs4dNfreBRi9S5YtVqRHLcIpQLByzpozhFGZ0rvPtRuaIXxKmXNDhPlEKlS98kscVDcRJbMmxjFIUMXRK56fVD6ISaX77bmaCdwoeLl964u28OJxaMV2HAjRW/zqlU+4QaOH2237XaONGd53SN5reoUa6NtvFp0HN9rauD2kHRzw9uN7P1W174bhl4jYL6dVbRtptNgWDkbeL/+95jVgvtczrSZlP7V8rrrD8VP/l3SEFc+V6sqoHmdO9RKlq9YlPgJIuK7b8oGeyChzYewvNIVwjqBFOXodJNnmggtGaij5DAu0RXUrLHD86ZYYIvak6uR8vq9BH8HRZsQKSA9vur4AUfPY50k8AsPOQjd1Dhy9NdYT0LQHD3q8IWI8hvSoIABaRMrHXAtlkUqzeenky2wurkdx0sjubEOaWzyO08qGft3MZm/B4XvumXOPsK1X4orB9A5AJf5Lyy6t7FDIIYrSKSs7382NYYXyZm9sFrVz3lp+eCQngXRQGUGs7NA6tn7HtEkyuO1c3L7j4ei4rySu7E+uAWxnj5xr58pfhm1mTVOSvX4rQr0q4AZxMbG9X2OnSOZJQ0MweKHtNLsk6WbJYxmdxg2Ze8k+c9MPFgYd6D5EFHfWaWD4AGp601NuEBlns42viAkaVMGtVgO dtxBC7ju WfZMpYRS5Wg4mtsqK2SzQ/Z3wyErpUp+PdJsHAxTjpeAId74DEv6M+ZjgPrHHmz3MQx4AaynYrJKT4htVo1u9sLiiJgIajfEJHKRqolT5AAABL/xYoYDuGq6YT3mrO+VPLiHzn3tXxF9b4rzRxE3yAXNV485GqUV2gktq6CvUSYNVVm94Ihn7DvzdYLI5Q6YbpmHGEi9CZ5mOjHmvFXHjK8laFHoA5E+MoJJZ 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: Removes uses of page_mapping() and page_index(). Signed-off-by: Matthew Wilcox (Oracle) Reviewed-by: David Hildenbrand --- fs/f2fs/data.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c index 5d641fac02ba..9f74c867d790 100644 --- a/fs/f2fs/data.c +++ b/fs/f2fs/data.c @@ -4100,11 +4100,12 @@ const struct address_space_operations f2fs_dblock_aops = { void f2fs_clear_page_cache_dirty_tag(struct page *page) { - struct address_space *mapping = page_mapping(page); + struct folio *folio = page_folio(page); + struct address_space *mapping = folio->mapping; unsigned long flags; xa_lock_irqsave(&mapping->i_pages, flags); - __xa_clear_mark(&mapping->i_pages, page_index(page), + __xa_clear_mark(&mapping->i_pages, folio->index, PAGECACHE_TAG_DIRTY); xa_unlock_irqrestore(&mapping->i_pages, flags); }