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 lists.sourceforge.net (lists.sourceforge.net [216.105.38.7]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D2B23C369D1 for ; Sun, 27 Apr 2025 19:00:46 +0000 (UTC) Received: from [127.0.0.1] (helo=sfs-ml-4.v29.lw.sourceforge.com) by sfs-ml-4.v29.lw.sourceforge.com with esmtp (Exim 4.95) (envelope-from ) id 1u97F7-0001iI-EE; Sun, 27 Apr 2025 19:00:45 +0000 Received: from [172.30.29.66] (helo=mx.sourceforge.net) by sfs-ml-4.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1u97F6-0001iA-3W for linux-f2fs-devel@lists.sourceforge.net; Sun, 27 Apr 2025 19:00:44 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Transfer-Encoding:MIME-Version:Reply-To: References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Sender:Content-Type :Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=kiHWomkf3wcsR+tvD4RLDrQZNUBMxVnHVwy9itXWJo8=; b=XLooHdsoFNTmzHk4D7TthjRl7t 8xGqQKINLGJ+Er5oz/rkGYsbTLMOiQHGq2Frt2PGoIEyXQVmUV27FXZZVV4XV+lSgTz5N/2qAJV8O RUSE1EISlZGzrFfQKWI9by62SvvvmxPmXJaSXjS2bQfD2Yi0rE4/wk4EwbKT+j3u8R5I=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Transfer-Encoding:MIME-Version:Reply-To:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Sender:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=kiHWomkf3wcsR+tvD4RLDrQZNUBMxVnHVwy9itXWJo8=; b=TGmEuaOnmt3UC8yMX/coIQFXcg vWMqF1eA45nQTe7PD+NIn84ztQJdCAfh6DmN5TXW0nW8YaLsx+ZVISbZd6d4Vm0+k+0gAju/Y0WXN a5Fv3+UU1B7iVivVtIPaEdzFwPAfHcdiJ9eCtnFXvHLXF7XkhxLoUJe9c2VXxtiCA95U=; Received: from mail-pl1-f178.google.com ([209.85.214.178]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.95) id 1u97Eq-0003Ni-EF for linux-f2fs-devel@lists.sourceforge.net; Sun, 27 Apr 2025 19:00:44 +0000 Received: by mail-pl1-f178.google.com with SMTP id d9443c01a7336-22435603572so45312795ad.1 for ; Sun, 27 Apr 2025 12:00:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1745780418; x=1746385218; darn=lists.sourceforge.net; 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=kiHWomkf3wcsR+tvD4RLDrQZNUBMxVnHVwy9itXWJo8=; b=UJWzy2/YlwNci9OwODBNYY5N1xZjR6+PoIW5O0UIg8IH4hsA18lCn71FEnZyK4J3LZ e0PIauZWn9ZQrUlbADzafC1Tb9jw6k7Q9FK7u9sd/AB09nFV2c41CgyLCW7IT+yjPho3 SrBPNz6Aa3DZ1PC4gCb38zUuB92bVeeSKpf9dLH/inavtImnFFV8aUZA5GVyDB2HMvp0 FsrI/VL5EgOcN7XdsE0tle/5aiTrzCps8ivnWO4e46UVKGZQt2wRtQYNWvAVfUIJshpJ Z6DbfCcndzhfqfeai9N4MA+V+zsTHgBdIPj2x40Y2juDt9+yRUxGJJ7FM+eyEv1dR3UR rWFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745780418; x=1746385218; 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=kiHWomkf3wcsR+tvD4RLDrQZNUBMxVnHVwy9itXWJo8=; b=qC634+uJUWysVQEFED9QY/+CYU9dRLHov66HQeruSmjEb1N9dA+eYe9AofRzCU/dJn bdob4yMgDsP4kXuDhbWtsCrQPhwIFOq9Dq8t7nJv7oestNYZ/4bLqeGAWi4e5c+4nz+O Y0JRBwrr844neNcez03+/PjQ4rUnliPOq/lV+Wr2ujAtdsL3HBdgYg0S4hxC5ztMPbVO ekf+2VqwwU3uD5N1k0YfHza6J3h8dG0l8SuhjaVBNMZQ/A3Z8TxahAGgkE5JyD/Qrf34 SOTJLAYINJEnEiD2L0BucW4Dqb6U3010RjdX7dg086q6B5ORudz6UaGrtdtMPMoiHBGX XAHQ== X-Forwarded-Encrypted: i=1; AJvYcCWnpNwQMuKJ8BBNKu93KbEX9cshGGke2w02CFg9lxIjsYHoji1Wmmc/i1wWkkv94iWz8D0pqIt1szNR7Lk8C26Y@lists.sourceforge.net X-Gm-Message-State: AOJu0YzA2mKV1BXU8q/rSNU+2P39KwG67GHQbpq2yv4MQQpxoNMTmPaE /Z0yB+kQyz4nuGNk8RVog4kxqAZk5UXlqP9KdCKSXrZYiF1Kyd17 X-Gm-Gg: ASbGnctdu5RvINBA44J5pxhgAErIyIedpkKXRPkjCmeG5Tf+IHLZ4G2X2nEhoJWgFaO F8d6XiFz2Kk5JJkDRJYhDLKK6PdSpdRqPe8P9zLh6GSW1NDuGykTfX6t9D7Y6Oj40GMRS7lRO2S Wag2Y3YyyXuJftNClJ9m7AShxlvoQQ0Itz0oBFD0yMZkmzbHOVnEaHXOTEzwX7b4dI7j2wRB+p0 AYLR8t6CEEtKkFZC7dG9M4GkgpFRx0QzY50QfwQilPzqrO28jMxXdbEh8SN5wEtFWDaAQhkqRDo 3jLxKb1J9Z5FlUfTjzruvbHOLQaKXRD2NDDnZzd11nQs6A9loqOKVZa8RGhSbA== X-Google-Smtp-Source: AGHT+IFUylfVVyaQkdTj7G9SXw4aWzBB2+YYrPKPSQjJoZLloI+KVj4P63eCYK2iieWNVOo68Fjdwg== X-Received: by 2002:a17:902:e18c:b0:22d:c605:a30c with SMTP id d9443c01a7336-22dc605a33bmr81867745ad.11.1745780417680; Sun, 27 Apr 2025 12:00:17 -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.13 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sun, 27 Apr 2025 12:00:17 -0700 (PDT) From: Kairui Song To: linux-mm@kvack.org Date: Mon, 28 Apr 2025 02:59:05 +0800 Message-ID: <20250427185908.90450-4-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> MIME-Version: 1.0 X-Headers-End: 1u97Eq-0003Ni-EF Subject: [f2fs-dev] [PATCH 3/6] f2fs: drop usage of folio_index X-BeenThere: linux-f2fs-devel@lists.sourceforge.net X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Kairui Song Cc: Kairui Song , Nhat Pham , Chris Li , David Hildenbrand , Hugh Dickins , linux-kernel@vger.kernel.org, Matthew Wilcox , linux-f2fs-devel@lists.sourceforge.net, Yosry Ahmed , Johannes Weiner , Jaegeuk Kim , Andrew Morton , "Huang, Ying" Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: linux-f2fs-devel-bounces@lists.sourceforge.net From: Kairui Song folio_index is only needed for mixed usage of page cache and swap cache, for pure page cache usage, the caller can just use folio->index instead. It can't be a swap cache folio here. Swap mapping may only call into fs through `swap_rw` and that is not supported for f2fs. So just drop it and use folio->index instead. Signed-off-by: Kairui Song Cc: Jaegeuk Kim (maintainer:F2FS FILE SYSTEM) Cc: Chao Yu (maintainer:F2FS FILE SYSTEM) Cc: linux-f2fs-devel@lists.sourceforge.net (open list:F2FS FILE SYSTEM) Signed-off-by: Kairui Song --- fs/f2fs/data.c | 4 ++-- fs/f2fs/inline.c | 4 ++-- fs/f2fs/super.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c index 54f89f0ee69b..5745b97ca1f0 100644 --- a/fs/f2fs/data.c +++ b/fs/f2fs/data.c @@ -2077,7 +2077,7 @@ static int f2fs_read_single_page(struct inode *inode, struct folio *folio, sector_t last_block; sector_t last_block_in_file; sector_t block_nr; - pgoff_t index = folio_index(folio); + pgoff_t index = folio->index; int ret = 0; block_in_file = (sector_t)index; @@ -2392,7 +2392,7 @@ static int f2fs_mpage_readpages(struct inode *inode, } #ifdef CONFIG_F2FS_FS_COMPRESSION - index = folio_index(folio); + index = folio->index; if (!f2fs_compressed_file(inode)) goto read_single_page; diff --git a/fs/f2fs/inline.c b/fs/f2fs/inline.c index ad92e9008781..aaaec3206538 100644 --- a/fs/f2fs/inline.c +++ b/fs/f2fs/inline.c @@ -86,7 +86,7 @@ void f2fs_do_read_inline_data(struct folio *folio, struct page *ipage) if (folio_test_uptodate(folio)) return; - f2fs_bug_on(F2FS_I_SB(inode), folio_index(folio)); + f2fs_bug_on(F2FS_I_SB(inode), folio->index); folio_zero_segment(folio, MAX_INLINE_DATA(inode), folio_size(folio)); @@ -130,7 +130,7 @@ int f2fs_read_inline_data(struct inode *inode, struct folio *folio) return -EAGAIN; } - if (folio_index(folio)) + if (folio->index) folio_zero_segment(folio, 0, folio_size(folio)); else f2fs_do_read_inline_data(folio, ipage); diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c index f087b2b71c89..eac1dcb44637 100644 --- a/fs/f2fs/super.c +++ b/fs/f2fs/super.c @@ -3432,7 +3432,7 @@ static int __f2fs_commit_super(struct f2fs_sb_info *sbi, struct folio *folio, bio = bio_alloc(sbi->sb->s_bdev, 1, opf, GFP_NOFS); /* it doesn't need to set crypto context for superblock update */ - bio->bi_iter.bi_sector = SECTOR_FROM_BLOCK(folio_index(folio)); + bio->bi_iter.bi_sector = SECTOR_FROM_BLOCK(folio->index); if (!bio_add_folio(bio, folio, folio_size(folio), 0)) f2fs_bug_on(sbi, 1); -- 2.49.0 _______________________________________________ Linux-f2fs-devel mailing list Linux-f2fs-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel 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 B770BC369D5 for ; Sun, 27 Apr 2025 19:00:22 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id AC0CC6B000E; Sun, 27 Apr 2025 15:00:21 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A47296B0010; Sun, 27 Apr 2025 15:00:21 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 89B486B0011; Sun, 27 Apr 2025 15:00:21 -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 66B846B000E for ; Sun, 27 Apr 2025 15:00:21 -0400 (EDT) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id A8AD4BC177 for ; Sun, 27 Apr 2025 19:00:21 +0000 (UTC) X-FDA: 83380739442.09.1244E83 Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) by imf12.hostedemail.com (Postfix) with ESMTP id 92F6640014 for ; Sun, 27 Apr 2025 19:00:19 +0000 (UTC) Authentication-Results: imf12.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=XtsHuDvO; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf12.hostedemail.com: domain of ryncsn@gmail.com designates 209.85.214.181 as permitted sender) smtp.mailfrom=ryncsn@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1745780419; a=rsa-sha256; cv=none; b=kXhA4z/S4fy79iI6N4nffUY6eLN3DSBB1FCqcdvU9jv9vOmyTDeOm57/5RyWEMU/o0osry yaaXFipam6aEC+0HJ6WKBJXqg9uMnMHizHjs5Nj9I+3nQZZConpoJl1ew53SuRFDfgheh2 TRP8MgCgzy/9JuBHQub7UlkBzRNkI10= ARC-Authentication-Results: i=1; imf12.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=XtsHuDvO; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf12.hostedemail.com: domain of ryncsn@gmail.com designates 209.85.214.181 as permitted sender) smtp.mailfrom=ryncsn@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1745780419; 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=kiHWomkf3wcsR+tvD4RLDrQZNUBMxVnHVwy9itXWJo8=; b=GJ4h/987wOGNBe5c8Nki5SB+LfmqQKia6/WYZ8A9xSZbrXKuwxfrbMpxKkuIQZ0+MA8+oI 2JJ5tEAHsYv/1Cl+Tkmi1rSmtbWF2lk5l10A3BAFiEcLzbqdLvyZ+d/WcMINvWGZNVJGTV VBq8KLDMSn2YO/+QVNisBvtxpzIO+Yc= Received: by mail-pl1-f181.google.com with SMTP id d9443c01a7336-22928d629faso41894615ad.3 for ; Sun, 27 Apr 2025 12:00:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1745780418; x=1746385218; 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=kiHWomkf3wcsR+tvD4RLDrQZNUBMxVnHVwy9itXWJo8=; b=XtsHuDvOCd3fN+uu3CkZjscIo0Dr+ny/K+59t7vbvHeFnqFntz+9fEhvJ9DiAmgIF5 BjT6I2VAP95pgCcMg+3v9MtvFjZgerPU3Dh+rNAmthmXmtrNzteJFq+X1lkgiEDFaCOa khCufufET2T5nLtJYsYxhnlaEFY4SD/wxYNYwrPMuYvNFH4Vt0UEreVQRkb8os5HIM6+ /bE3oClShNfQqi5FLT1BdHmPXQNIz55yMkJh+zyXCftqUW4e5Vuqiv3GzcrjMzoObHQc xNkQqVN/IE3iYda7OLcBMDI6rdLn1WxfwBVhaQeC6W8R6PKqoyAt+iKXcLBOMUU8TPtR tZpA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745780418; x=1746385218; 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=kiHWomkf3wcsR+tvD4RLDrQZNUBMxVnHVwy9itXWJo8=; b=dDVcpE9Wo5L5BKCGODAE3OGNH1xPgW7sLDSNdlK64BoiZwqCCRBFFegUVMAatzaCcN Hojy7UqSZZmRjTTeCIW4wGHOxZ4uKLeyNZC1LLCYUkOwAVz1JMUgVNrc4jge3MDBFAkz cSt5gjzFCnSubaHT6yuibvfXPBFQdQ9D67gJmEjBBhhxzVdZBIuz72x71PwDVGld6AH/ V1TmrsMTNBL41d9q1g90VL03cqQf3iF7XIsbd9zmLBeCJNZP2qB4M+D9TTYtZUjB7efj beXbAKeMNrEXPSLWZc8cvc9RHMvXGN7NyZy5u7qhbESR+2aIA7caGAXPZrjAO6gp9/D4 7PuA== X-Gm-Message-State: AOJu0YxFD7/JRuiHY1TxyW+GzcDS5mWjux/80mtveHPzqDwm5roRes+0 Gqn7Pk/7glES26gdCG/Ot5zQVU9qXoQX/p6M3NIqsfJQjFOx//uXDzzjeBxS0hI= X-Gm-Gg: ASbGncuPBczt60uSSRVxn8k+On2nDNqePIgHTg3DA9hpeKbBiGZocuykU7qNn8R5FD+ CbJMJQEwDoHTfugf4tyjw4XVeE06RgDrbid764fDjMuWeEUZtkSMLO3VCcQ/3fS7U9mKTxrGnVk fA6GPgrnlPN59QWG0eUX75doTWlMu48FK/VxjZOdvfzDOtlGKjyqmaO0zm0qLTNRcXwxVQ7bNZw CPMIX+x8XB7mERW9w1migLkeWQxVLT+n/8DI7KDcsc6cj3zXHo6VXmq+LJzAYh+1SwBQSXA0J4y Ks4GdMpRYsWPg54hGFVzV4tRH+5dRqvBiShKx7vPHCvB+vFqGyUfSRts3GkmXQ== X-Google-Smtp-Source: AGHT+IFUylfVVyaQkdTj7G9SXw4aWzBB2+YYrPKPSQjJoZLloI+KVj4P63eCYK2iieWNVOo68Fjdwg== X-Received: by 2002:a17:902:e18c:b0:22d:c605:a30c with SMTP id d9443c01a7336-22dc605a33bmr81867745ad.11.1745780417680; Sun, 27 Apr 2025 12:00:17 -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.13 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sun, 27 Apr 2025 12:00:17 -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 , Jaegeuk Kim , Chao Yu , linux-f2fs-devel@lists.sourceforge.net Subject: [PATCH 3/6] f2fs: drop usage of folio_index Date: Mon, 28 Apr 2025 02:59:05 +0800 Message-ID: <20250427185908.90450-4-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-Rspamd-Queue-Id: 92F6640014 X-Rspam-User: X-Rspamd-Server: rspam07 X-Stat-Signature: u15ec3m36k7qcurtyg39t4p34bbiszc8 X-HE-Tag: 1745780419-111811 X-HE-Meta: U2FsdGVkX1/EH39CJVYSkVmEqC8tukRGAmVNv5sqcNyuB5ZwEW4eYyjg7p76IcPZNyxYmownOTPdm1QmtVrqpB888Z1L8V7FLPyXtrx2YgtGR3eKoCcioPY1T7jTDdzowAF+z2yBHN5w8ABlMtq1I1yh0BsLgD9+R0PWmHTsOZqefWm5DThaupcuZAxbpp0decqY0AE+Yel7q+cmqT9o3aY1iYTJlOv3rMShkRmt02EA2vZd9s1nLt5KL1yFyLNs12Teg12A/RCgbViCibMSvH+5f+qMWmPNDbn23Gfy5oTNzn37ysQnen4THHQ8H1C6Li/jFtS7lCtMtDkkRgSpcMhAxd2XnZnrKQ+g8XwZLJ6v6kyzZ+LNjS57PC3xyjMUKjdMJ2Uve0LEyNq1X7wm0fpbrmqG5+LSfhBpZZHfVkqOwuvk637D88mI9QFx6SHboJ79ijtDjrFCbAOnuI61guMx1Em3LgzXjuQgpTYgP2AjmDWIa6lZLY/Qt0GWM/Gmg9WFhpjqwAPs/T95GEzl6g87hx4ywoyLjOq0nEL52Fmu0xviFmziUn77dKoCvNGO5igGD9RGBVLo10vzjT2VO/lk5e4IxlQwZc51Gb9CStjsP9Mn/4NrQgaxMy8SkgumYTKZhdFpIRFdWFsjQJrK0iQ/Barb1qiWXaIFaSWKDjHcbIbOOAr4loDvdpfoQtmO5C3/DqTIjT6b5Xuabv98tvlS07KrWK/COwErKcVbC8ASvTr8xEy1lqKoSizS0HgIBOxL5LKu4hRA9CxDzFi44JTh69rro9/42QQlt3rWFWB/UdfT3jHG01IOsg+MrIHgNVdRptI7xPeLmbowH7XdttdsJlYvfMGaw8yLMhQ2DQ3G3cu6I6Tcsx7iYA9Zg1uW0Ac2IfjYvXJwI6ySGGTO2OCiaMIpYggHCuUz6yVz1spIKeUv3DSqvORHiQJ9mRb16pUZFKOIvlQrcNZ8KAt 0HkJsucX DU4mLVhLkG9AczY7XAwMXw3dUJ1BxSShBK8q2rgJQSmL6xll8/pc3r4Y9pPIsoLhEnnmqjKfCWTm/hLhCqbX9Jw+F2d4SQZ6LW0sbIjbtJJKrFidez4QhrCXB2Q8hlb6Vl8lNYs2Rsrv38Z+y3Vu4QCykSpiKi1SNgvqibkgYU2E8fJm8nuIqkXCK8PMALdGkBNAIdjuERQjCji9xvMVveGRdcj/sBgKPxRDoTAGffoAXp+bd72nbWX+AXLyase2A9uNBa14OFS2Tp+OnR604BRcU1qW5KiFCKPssfRN2SLEEFEcpdn9qg5F0BnFoqTVIHerQhxZDgSbFLTZIU7xKf5SU+di79nWQ+3XUpefOZPovdwQNaPX2S1yHB1Fo++bajYa03iyPqu/HIn3uA3NglWd4Ze1AaYpZp7Q+UEfbZXlMv1bak6FpyoHwDO8FkOi/osxgiDdWbFIIRBJmA4s9WsSaKG7yfO5+3OPbRZbig2D1pCEhAcZBCKli9xG4rAQGiffvDKV0lqwOXeAmIh2xsUXpxk2U7hr9X9epnJ7chFGVhgbVSoa638Zs2DF4vN6c7aVkYq+7UjhZqV9chsXQx5ERK59+5UAp6ANI+/imGAyOQE7ygZ5i2UJO5+w7/qx3FTtQiXy+ktZVHX0X2Wd7+xbfjzPyHxJQMtoL 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 folio_index is only needed for mixed usage of page cache and swap cache, for pure page cache usage, the caller can just use folio->index instead. It can't be a swap cache folio here. Swap mapping may only call into fs through `swap_rw` and that is not supported for f2fs. So just drop it and use folio->index instead. Signed-off-by: Kairui Song Cc: Jaegeuk Kim (maintainer:F2FS FILE SYSTEM) Cc: Chao Yu (maintainer:F2FS FILE SYSTEM) Cc: linux-f2fs-devel@lists.sourceforge.net (open list:F2FS FILE SYSTEM) Signed-off-by: Kairui Song --- fs/f2fs/data.c | 4 ++-- fs/f2fs/inline.c | 4 ++-- fs/f2fs/super.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c index 54f89f0ee69b..5745b97ca1f0 100644 --- a/fs/f2fs/data.c +++ b/fs/f2fs/data.c @@ -2077,7 +2077,7 @@ static int f2fs_read_single_page(struct inode *inode, struct folio *folio, sector_t last_block; sector_t last_block_in_file; sector_t block_nr; - pgoff_t index = folio_index(folio); + pgoff_t index = folio->index; int ret = 0; block_in_file = (sector_t)index; @@ -2392,7 +2392,7 @@ static int f2fs_mpage_readpages(struct inode *inode, } #ifdef CONFIG_F2FS_FS_COMPRESSION - index = folio_index(folio); + index = folio->index; if (!f2fs_compressed_file(inode)) goto read_single_page; diff --git a/fs/f2fs/inline.c b/fs/f2fs/inline.c index ad92e9008781..aaaec3206538 100644 --- a/fs/f2fs/inline.c +++ b/fs/f2fs/inline.c @@ -86,7 +86,7 @@ void f2fs_do_read_inline_data(struct folio *folio, struct page *ipage) if (folio_test_uptodate(folio)) return; - f2fs_bug_on(F2FS_I_SB(inode), folio_index(folio)); + f2fs_bug_on(F2FS_I_SB(inode), folio->index); folio_zero_segment(folio, MAX_INLINE_DATA(inode), folio_size(folio)); @@ -130,7 +130,7 @@ int f2fs_read_inline_data(struct inode *inode, struct folio *folio) return -EAGAIN; } - if (folio_index(folio)) + if (folio->index) folio_zero_segment(folio, 0, folio_size(folio)); else f2fs_do_read_inline_data(folio, ipage); diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c index f087b2b71c89..eac1dcb44637 100644 --- a/fs/f2fs/super.c +++ b/fs/f2fs/super.c @@ -3432,7 +3432,7 @@ static int __f2fs_commit_super(struct f2fs_sb_info *sbi, struct folio *folio, bio = bio_alloc(sbi->sb->s_bdev, 1, opf, GFP_NOFS); /* it doesn't need to set crypto context for superblock update */ - bio->bi_iter.bi_sector = SECTOR_FROM_BLOCK(folio_index(folio)); + bio->bi_iter.bi_sector = SECTOR_FROM_BLOCK(folio->index); if (!bio_add_folio(bio, folio, folio_size(folio), 0)) f2fs_bug_on(sbi, 1); -- 2.49.0