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 C4C72C369DC for ; Tue, 29 Apr 2025 11:50:35 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3C8026B0011; Tue, 29 Apr 2025 07:50:34 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 350A86B0012; Tue, 29 Apr 2025 07:50:34 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1CAB16B0022; Tue, 29 Apr 2025 07:50:34 -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 ED3F96B0011 for ; Tue, 29 Apr 2025 07:50:33 -0400 (EDT) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id AC66555CBC for ; Tue, 29 Apr 2025 11:50:34 +0000 (UTC) X-FDA: 83386913988.21.3A8AE59 Received: from mail-pf1-f173.google.com (mail-pf1-f173.google.com [209.85.210.173]) by imf13.hostedemail.com (Postfix) with ESMTP id CCED820011 for ; Tue, 29 Apr 2025 11:50:32 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=FHt4rHyS; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf13.hostedemail.com: domain of ryncsn@gmail.com designates 209.85.210.173 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=1745927432; 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=NRi4DVQ4l2yFg1fX4IS9tDs6tW+LC63jcXq9t1eYUbg=; b=2c5FTUfqfRvjS6Z7p7SReMO949U0eC7+ehVkXYRlJlwVhC3txvNB4qDyJWsiMUNAwUr614 jQqd1E5ACj6P7Aucufj6qS78ckPi9FRAX3fSadOh/f9WtCvGRpLR2mPa9zZyCHk9qLr6iO aJNaLaes3oUNvqOTmoGaqiWqipUYYfI= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=FHt4rHyS; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf13.hostedemail.com: domain of ryncsn@gmail.com designates 209.85.210.173 as permitted sender) smtp.mailfrom=ryncsn@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1745927432; a=rsa-sha256; cv=none; b=OqwiwB8XIx2wcZl5aXq1SIiQm+J1Nvnmkxx2zYB5HcURHmy7rh+eknVHf4Tl8v8OALi//8 NiKGn5S50Q2k0Hcidkarx2GfupfXHC40YTfVs8qAxbquTwIf+PaqebEqn01ODF24UY+Wji lgc0jFTQQvGqU+rj5BcA7pbXEkMw6h0= Received: by mail-pf1-f173.google.com with SMTP id d2e1a72fcca58-7376dd56f8fso7908321b3a.2 for ; Tue, 29 Apr 2025 04:50:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1745927431; x=1746532231; 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=NRi4DVQ4l2yFg1fX4IS9tDs6tW+LC63jcXq9t1eYUbg=; b=FHt4rHySzxUrFVHrmu6Dtwldu6SwEkZD6TclFmjAg9AV8rovprO2V3GE9AjVYgpNUC OpjXSqZdhfWg1sjjucXpPJ7DvCjNe0kDOrixMvtOJBsSFbXrRYmRCXLgwJfNHnesCuCE oggtSX+yajGlGizstVznkgyZ46lZpsXqtbRRAqeYANml29pWSsV7EYmI5urYr7ZYlNrr jf4yLQknkWdze1itWB3O/dFWuqaNH4qazF+yNFaUDfEWWXCE6R7EMlJzAjeIpcRctUIw NioQ5SW6Ry19NgzV6IIV/MTSQ9gQzPgKwiBdzUTD4E3MiL/DvgWY3ZbblXxKBig7f9Oa BzaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745927431; x=1746532231; 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=NRi4DVQ4l2yFg1fX4IS9tDs6tW+LC63jcXq9t1eYUbg=; b=jIKoC7oiyMvsR/NQPrTOouayG9ykjRHL4dRw0RDWT98XkW7+SjgLEGSI9yzVqe9GfD jsrJqUpecEryuDY5rOk7L4I28ctIqajwL0Y8jsHKhhyEKKRW+hRYLfy077bUtz8wUtXw 2OY4XI7tjvrBkjVjX1CcRyNpa7Buysy5Fv6IF45kquOz3mKdgoRqvgIiJ+VsvXxHBVYm OVOZ5puQU1kCgVhwjSQSo3gLyDvwSbbcKu1kA1VVIAmrWYXcYVL1c86eqT5ZzMo2yPLH JH7hzIOzxED509vi4c4nP3AEq6AozN0Tr0iUJKjan/OYeKWrXRgaG6PUrAZnd6hTzCd6 hobA== X-Gm-Message-State: AOJu0YxSUxuLiE2FWQn2sQyWCRwiVppuR+fJDVUMt4QVVawlsoYn8ZlO IOwHXV8PBhDz0YNVJE6tIgKxAUlJTHGOFDcLWauUDKXgEKZ5cJG+MufmYGNs X-Gm-Gg: ASbGncvd5/n/3pC0gAMubUI/berOfmiy4XboiCG5o2G5B9dntLDxbSs562E1iqZdNH/ 4Fz6nIbfnmpgIv4vGzkp6/3LUpvo172Qy0VujfG8Vc/74X5e0mRdvIzEaIeYWD2xQa2tJeHs4Vg u88AV7VLr/dINq8sdnotoi1Eh28onDZ/cSVqXLPkACnbMHgr9KlzrAH3aA0QORxnXci0JMgSYSw YigiG3SnguT1mcwWbtXuIPKzXTLhtrCUtvhl+fA5pKRt17PKfEJYGudOWF+n1OFLHfaUrPZaFw9 KkHoypHNrUHZ9wXguvdklDCdgVtxEEj7lkRjFDK5LMUjbDYOgDgbH7gtOOjVhMDwb2aMuKI= X-Google-Smtp-Source: AGHT+IEoriRK2NyH//YcoOQqQiNaSwS5WKzp7Q2fF6Hs41CP4tZDUS769rp7JmgItvGnje7zbfgCvg== X-Received: by 2002:a05:6a21:4a4b:b0:1f5:59e5:8ada with SMTP id adf61e73a8af0-20958f841c3mr3725562637.4.1745927431033; Tue, 29 Apr 2025 04:50:31 -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.27 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 29 Apr 2025 04:50:30 -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 , Jaegeuk Kim , Chao Yu , linux-f2fs-devel@lists.sourceforge.net Subject: [PATCH v2 3/6] f2fs: drop usage of folio_index Date: Tue, 29 Apr 2025 19:49:46 +0800 Message-ID: <20250429114949.41124-4-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-Stat-Signature: rh7wj3z1g9uhcaj5njyhgphct3fkys15 X-Rspamd-Queue-Id: CCED820011 X-Rspam-User: X-Rspamd-Server: rspam05 X-HE-Tag: 1745927432-522496 X-HE-Meta: U2FsdGVkX1+NTuIiLyopzmSsnQhJAlHmt9244uOpCdKt77W9087KW7zVQGpPErzXjXEDfgKx62eGTEs11jfzO/wbSbxf23Ebb7WqQ6Z1YfuxHzrtZkfAQ9fpVNZy/lvVLjgR/jTczUipA1Y4Jc+kun9dgF5BcTY+CBFUfI4pUdz/6xb/w9r9K4J0ZqHVhVejGSfbQ0/6RTGpiARPNUZg4BVU5FDNA9Nk75tdaeQEy0g0fwIILOIWkX1s+E5I3NPZN2xqUo/kAw3wCdq6Swzgf9yDarQRwFoDwnURTHbRnfW8aBb697ZN1BWL//7IOk2I5mY6lbf/+QK9JOqOc6BHSIMW4t4a0tpa4bmjKkVp7MrtIj+EvEpqdBcoDNxPtvL5Xi4DUobg2CUiVxDqEMSljELgsaMIcq3LfzzMxJ17r3yVR/Jx07fU80GfaaU2rnVy0cPdzq6RGo5aaw80AlhGtGiYCN/YMGTsqwASvJdLcFbwbgvazOPrZPiwcyZfPmi1UZDyTOafEjRANknA8mzLyZQM4JshUeWfl+1XNgmgJYs3zZ/3STDQuplRns8MPCSklD6TVcNbCjOdWmlk32V6HtgANPJIy1Oy9rzTYDSD5ZCrUYFGoWqV6bB8x+QPWK7P+wpV/T3ag/wzdhB6TZGl4zutVrLITEp6rj4tkMPHa9Ooku9FEb+wGgsqvHfeVe6c1SoTFojmpRp2pAk2al7nZl+UkMazDMIeEQAE04qj6ZAPaeGMOp/u7RbjedRbzDxRqBO1WwgI/spWY+r+9sMEKnRUNhV6NYuwKt+iEdsqRL9RS4S2JVuLvAfCodQ909xyOYZIgVm2L13BZPqhyH3V9U4Iyb8RJRuOzowav310FediGoz1qSXC7p8LMQjf74C4cX0+kYgaiHflbA6tvsZEbZ3HcnFctAIk+bytxm+UIqijkUOkT3C/ZlqwUwU/PTYJBJxKAOYrijL7EnvRjl9 pvB5FCdm QDsAuG/uz3LHBrpcl11vu+kXmsfBk2OEl50Q/ZFG4c1MoaoOVl7BDTgIVW8nevKv/yLRhdXzpNJz0i/UamlExw71aBzUufLNZ8yKmv/hlpeajQA/6zo63QmejmuRJKCF8cKFTE9uz0my2BTcdwgVU0z1/7E5wN1VQVtb6V6Sc/iPzNpbsJPrFJxQYBg+IZRYTgRrwwHss0FZaPu1jAlI1a2JeoR2XSJbx6xH72Klqvpp4VaXN6YcM30OP2+3nKWft/7TGUAGw1E1nm4P02bL4Ip8xqlRbc3Bkf8nTrY8SmJfyoJ6lBspnx7MofYp75njVQEjYjVm6UOIxSoEdTrrxafi1h/BDrl+iS8IT/rt+Mogs4agap/huKkXKKfERVdZB6A8oZOSVVuhXsTBSC2ReUTGGAkGBuajPJH1Dy+GReYA/KxnUUPBjLj9+ab+yZMb7UT56UTcIvLw6lg/pRBUlzYHOVV3Xpg/0FtGYxO5VobsbF3sVzWvb1oCmLbIAeoA0ZsqsjZGxrF/jx3Zmri2qLJjNCralWKW3+1pofXBdlW7JGq35yK2E9wFjwmqyrebxDPSKL6hylIy4n9fCJNGgVjdHJ9yPT0BjlV0wEohxOndJ1lvuCGd2Agg/wQMoTN3icDckCUbrVLl74jfA3IS3e0q8v23h13nCoYqzmNqzyUYt60LYqC22byrDSHYXmQip2b/O9m13YLVs/gvNmC1XaIf2PhMe7kpbLPoz 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` but f2fs does not use that method for swap. 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) Reviewed-by: Matthew Wilcox (Oracle) --- 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