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 989ABC369D9 for ; Wed, 30 Apr 2025 18:11:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.sourceforge.net; s=beta; h=Content-Transfer-Encoding:Content-Type:Cc: Reply-To:List-Subscribe:List-Help:List-Post:List-Archive:List-Unsubscribe: List-Id:Subject:MIME-Version:References:In-Reply-To:Message-ID:Date:To:From: Sender:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=Zfoqq8XX3/AkOUbY95tiGdCudFh1Ud0qtUGbHLv28rw=; b=IUxQww/Q6yDC4qVFfoonEhvToj TzQLJe8dWKqN44BCMzJfSCW5KnrwOQD9yWKO1lSFaCQOmnFzmKpcydsLHFuqnjEmoe9gIzyH8Cd3w f/yegiSlV04cI535hqH7n5TQAVNRrmIA39oSocvTQ/fhgUgD/8QqGjwv/1pQ00FM7Ja4=; 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 1uABuO-0000dP-Cb; Wed, 30 Apr 2025 18:11:48 +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 1uABuJ-0000dF-P6 for linux-f2fs-devel@lists.sourceforge.net; Wed, 30 Apr 2025 18:11:43 +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=NRi4DVQ4l2yFg1fX4IS9tDs6tW+LC63jcXq9t1eYUbg=; b=hn2aL7jY1FoY3cVAvcxs42onPM MhAR7EgNxg8cxxmuQqXF26FMp3KhmFwjcu7ShNmReMvdns3/hWI6+m3B29+uCTU3aU0BFN9VgITdk zbE41uiN1LJazrn2U80GpRemQJFCUP0RIn25LyHTLwEzurwwvQ49TU2cSfWhYkm0sK1A=; 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=NRi4DVQ4l2yFg1fX4IS9tDs6tW+LC63jcXq9t1eYUbg=; b=hKXaeXL7DhHHLilaUuyXBbosaC 6OJW2hypnhteZ+FoWbkuMjTyiLYKt3RbgXcsxXsmt6+4cdwV8TmAHFS1vJw5CY6X7gOdvWFaVT5N8 etUwzfSrKbZzi79hRceQIqb7VU1HCiCIEbZwQAOdIZziX5nLw3qgr+cELksZATUQ0L5E=; Received: from mail-pf1-f177.google.com ([209.85.210.177]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.95) id 1uABu4-0000mz-2M for linux-f2fs-devel@lists.sourceforge.net; Wed, 30 Apr 2025 18:11:43 +0000 Received: by mail-pf1-f177.google.com with SMTP id d2e1a72fcca58-7399838db7fso283277b3a.0 for ; Wed, 30 Apr 2025 11:11:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1746036677; x=1746641477; 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=NRi4DVQ4l2yFg1fX4IS9tDs6tW+LC63jcXq9t1eYUbg=; b=jkjOf59CN6w2UmfCEMbK0WH8mPVM4j8AVMieAtHHq/3wbwieCQOW2RIKMljsYzM05X 4rqxVtszTcXYJ4VYONkxJmbrQ/8KJu+JNX03jLtblifZhu1lYqt1TdYIzdJ/qGepGMgn 5r2tdA5urZc49LWwUrKvqcTRAqVSVazM9N1NoA40E/F55ptGIVJZkkwFvg/97D4dHiGF cMJEKSmqtubzrqMP9C/TaujrOG+wusd/RYxIWcvFmOj7Ei3lWeo5uekjklWI6v1JUFN3 //0TJ9IWxaDrD50N+5DIy4g9xDBEf/dqJ0JZm2//ro3X3Y84Ad4p1LU0ik498KTemrLw LI9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746036677; x=1746641477; 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=C/UfdbwDsCGjla52Fi7IALzbtRZOIK+Lk8xR/51YdKqsUKkSjw1SLqL07EmQde74dJ 97pdadVUJyX8I2L7joDJfs14mB8e5yeQMdHVnVSY/Nk8G7nWSzvcYOBwNCbodicOYWEa f0njSQHaPtpbMWnP6vsO7kW3/x85sf12W1QIFlIbtg7lodgd9b9nv/UNx2FdDIRD5NAs gWQPZaTLWSA/RIllE72y75AKiO/w6lWAZrUENtZpF1A65X70hxvrXcqiCK+whSd3d2xY zA5aPufre8rEE+Abj9rhJVjDu/2yJEjRSxXP1P3X3sHxx0AACBJHwX2R516PiVaYJo09 rQfQ== X-Forwarded-Encrypted: i=1; AJvYcCUGH7n5h8V0IqG6SYb5tyJTxJDyObwWkTR8Uw9+InAlZaFywvB+n9bbFISoZcjWmyQ0Ov55tHx5Np2l6iEb02wB@lists.sourceforge.net X-Gm-Message-State: AOJu0YyU6BwDItbb20ag5tpRo+i0r+L2w+WuB5ull4E2Qm/aRkLFlNQt ik3rHsOytoUMfeKe5vCRXscm379TMr03jUFoiMRlGhVjI1fqD3X9 X-Gm-Gg: ASbGncu6GwcL5Cdg+zZID6RQ9P0fMaKU7TVZD4rIPO+hIWYJszZPE7C3JZ4SJtfmNaG xqrBXmM5MMhL5DiAyLw9FaPD18kR553rXqMR17o256q86/AimvZkgrHLPKHP4rIyAREElpYNJ0M IdlVyOx/l3Y7EU7jH/AwsfHwW1ly9Zr1TLmyqIY8+F8UwVINjMLteeE5W3ZvvL130qr/tFyZRqu azcmLmlCllRY4Znaj+otIP4pSqorkg28Xv2wuKUz39KKva952muVf0M01LGNciXenzg5fWfh9w5 2GwyVkYszGU0+VKGDoV7KMBAed/ca+sE+iK+vo+VLcPTT/SnYmgowHMR28BxGA== X-Google-Smtp-Source: AGHT+IFui7W32qe/7oFPxgXqGuD21PFMOpd9VG8chpu1c5yNXFW+POaOkysCOWvmg5iIKChIBFoOWg== X-Received: by 2002:a05:6a00:391b:b0:736:3ea8:4813 with SMTP id d2e1a72fcca58-7404613f584mr699444b3a.2.1746036677129; Wed, 30 Apr 2025 11:11:17 -0700 (PDT) Received: from KASONG-MC4.tencent.com ([106.37.122.198]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-74039947976sm1983822b3a.84.2025.04.30.11.11.12 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 30 Apr 2025 11:11:16 -0700 (PDT) From: Kairui Song To: linux-mm@kvack.org Date: Thu, 1 May 2025 02:10:49 +0800 Message-ID: <20250430181052.55698-4-ryncsn@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250430181052.55698-1-ryncsn@gmail.com> References: <20250430181052.55698-1-ryncsn@gmail.com> MIME-Version: 1.0 X-Headers-End: 1uABu4-0000mz-2M Subject: [f2fs-dev] [PATCH v3 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 , David Hildenbrand , Chris Li , 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` 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 _______________________________________________ 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 0BD44C3ABA9 for ; Wed, 30 Apr 2025 18:11:22 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C84E56B00C0; Wed, 30 Apr 2025 14:11:19 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C31496B00C1; Wed, 30 Apr 2025 14:11:19 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id AACAA6B00C2; Wed, 30 Apr 2025 14:11:19 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 8B2906B00C0 for ; Wed, 30 Apr 2025 14:11:19 -0400 (EDT) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id C9B991A0776 for ; Wed, 30 Apr 2025 18:11:20 +0000 (UTC) X-FDA: 83391502320.13.58A71AB Received: from mail-pf1-f181.google.com (mail-pf1-f181.google.com [209.85.210.181]) by imf14.hostedemail.com (Postfix) with ESMTP id D4B83100003 for ; Wed, 30 Apr 2025 18:11:18 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=lt41TDb0; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf14.hostedemail.com: domain of ryncsn@gmail.com designates 209.85.210.181 as permitted sender) smtp.mailfrom=ryncsn@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1746036678; a=rsa-sha256; cv=none; b=WccjSngRgLUi8qZqK5NSXbwSSZbd/GKELvSsO1yHzaiCHaa7MRjOHWMORywQtTAk8igfpn /pVAPf8LLZNuXzlvNeR9a6fSLliIJsDTeWkaFRjOMXIELfjIFqMtomYqszGyh3OqcoFLu2 +QGqyqo4FI93cVoptp3HslshBN5m8qo= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=lt41TDb0; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf14.hostedemail.com: domain of ryncsn@gmail.com designates 209.85.210.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=1746036678; 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=ZnqA0u1YnX67QzfOIMukBH/SIDNRngsES58PtwvA20+kM3XKt+A0VPdwXgRQ2XpjO4I5su SY2/gGIdcCT9GlYleb3FTWYE1SdqPcIOHA0IImpS82j19xFr6A90w3GCeMmETjgzpGnFA6 8P9wuSRcPFYDakLFp2p3EVK6sWN+VUQ= Received: by mail-pf1-f181.google.com with SMTP id d2e1a72fcca58-7399838db7fso283286b3a.0 for ; Wed, 30 Apr 2025 11:11:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1746036677; x=1746641477; 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=lt41TDb0zQwklBeVAm7QtR8lcxk9JdgiRepMo3m/H5ddZJU/9bgNkInccVrdS3xBSY bmygdeyCRxXmY/SEfsgtIxlxCUj0WB+XV9gt7vu/+/btTnWmc3SVOp/Fs8YtkmcraTa7 qdlEll+6TYKn/qR1hcDf+P4HcNZRtuzWEuZDk2dFL4jh1xfr0Zhjx5x6O7aQyJK9rXZ1 2BhoJY8sZAn/IDp3R6zRWoY12cR2rXzbfdP9Yfk+89GG9yGux2NEKd7gfVAbz9twCLDI 199YyAt4quClyAPtFD4FRAAjdTDjq0mpJZNwne8qKtX026NpzZObuDa7CcGbdndeMZp7 7umQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746036677; x=1746641477; 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=LOSCQ0QvwRALD1c1b+Yo51+RENUGzOZ+FZNe0Fwrj+vFYjcZeg9cd75Ahv7eyxTgST MsV+It17dTzJZ5jcv+apn9w8rU8aTzgR2irTYt9Z7XleWVvHeML/ty/WEZ5n/Wpa1VP8 lbnxNYcPQPc1QVUwCc0QNm/AlIF7fViT7lMrfrbSg3Km64JhSodcGA2fk02AbccRESlb wI9VA2Z9UO5SDNhtvk+WmPyJkFVWKupphYTVn2qL1rOjK5Yg1ddLItsDv2gNiFg7g7KY WoODK3IvrApGMA/30iimwdww5Qqh0pUBakbgpcerRYpxSc+0w1LmXytTDkP7T9IrT5pO 4tnQ== X-Gm-Message-State: AOJu0YwDWBVPDjTWvVfClZQaJtrND7v2bzfCsUt3alpL6wYKSwyBCy5g USg8tLrNE2UseJsUkC76SHOc2nfvISgzrznAZDgltqsNTmmnwRKAzTbK6ciGyJU1xg== X-Gm-Gg: ASbGncu5l5YqpG2mFpdcbooomxYchHP/tIXeL14bd7Hrp5YHMJIhdCDh04BhScRe0X7 OuCOGcsJnAKu2zbmBBW7ZsjzKI1g/mEy7/aboOSbt8RTg+E1uahRe9DMr0WIguDzjEPgE2feQWA HLvG3+UxhTTVsBIOh0iCZST+GuQamms9l7dgTHPn50vm8ubp8nyhsonHgF3IPmqVAu5wyWjAYYv EyvIbUCM8Bdy27/Mn/gBCo6y9S2FgRwf5xwj1bPFcA3luEwejit6f/aFVzT0wWw3IOdqdph7Qi1 FLtgvaChgM879pRdYXQyG0SOjuEYCCxUQjk8bCcgejFh44UKdpjEN41LSZcbHw== X-Google-Smtp-Source: AGHT+IFui7W32qe/7oFPxgXqGuD21PFMOpd9VG8chpu1c5yNXFW+POaOkysCOWvmg5iIKChIBFoOWg== X-Received: by 2002:a05:6a00:391b:b0:736:3ea8:4813 with SMTP id d2e1a72fcca58-7404613f584mr699444b3a.2.1746036677129; Wed, 30 Apr 2025 11:11:17 -0700 (PDT) Received: from KASONG-MC4.tencent.com ([106.37.122.198]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-74039947976sm1983822b3a.84.2025.04.30.11.11.12 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 30 Apr 2025 11:11:16 -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 v3 3/6] f2fs: drop usage of folio_index Date: Thu, 1 May 2025 02:10:49 +0800 Message-ID: <20250430181052.55698-4-ryncsn@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250430181052.55698-1-ryncsn@gmail.com> References: <20250430181052.55698-1-ryncsn@gmail.com> Reply-To: Kairui Song MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: D4B83100003 X-Stat-Signature: 3u77h8681ag9zzqnszbacmdgnrptnhyu X-HE-Tag: 1746036678-860960 X-HE-Meta: U2FsdGVkX1/oo7F/h2MQb8Awe1rjTm3o+Zyt44WzmYGSbJRQQJ42L2CVuBH3BlYw8FY/YsVHwFjijD3jOTPAYl0aS1jweae6SYaJjp12p08w91JiLSq+9+dqtGHgz7Ana7IbZpMeM8FIU4i6Qb34pN4kSjKsfXzN5MfjPFWPYQ7xj5yOcKqX0Nwq4kuZJN4akFEwKhHdkVlaerI+rgMUYJkIBll9TVDCfWu3UORTYSK8+In0CDPkS5f9w58g07a1gL/l6l0NPbuDSlDyHC1b/DOJLzW1PgYmhUD/WhziqudaUUGEZn/215xn6Bri2ZfR6an9HuXOoUd8YDACY9otleMgnPgYVsZr81Z7JaOfCsigrkhllIJ1/xUYMACUbjt9izrVehlbptbiVMmt/zlR32LbIrtQbs8enG1uKltTKwqAjcbVcsdfNbj/D/S4p8qWRIRiQ833XjSuDsJAyK/Nw22JU1IcI80gjRj9/K6rW2j/y++mIEiyyeAc4mpihqhab1og8011g/ZpcAafjhKlD9zn0s7hq8F6kvzW7OTlCx4bBoC/zfd8FhPurmVqNMcsPRq8m54qhFDXnaxw2HR5NiVRkS+wUDrjCcI7VWz78CFNo5/hAUx3apeHps4CwFvHxslDlbyOQ6IxMxyisTLPNpxKI7yXO2mZs1xvGbcGxVzpCE/xBEw3hO/KUwnbUj1aulEJyyaSaHjor3FUdv6dsEC5y9yLFwN7+wEWU8GwSocVk6ZeqH5NDQLzd2xlfSESfifDV57PGJpYByJKHfw4Q2UVpxvNSXc7r3YgdBqJOA4XHJbWNL+VbxouEdsYxSFRJNXILRJdXsFCf1SqM2K9UeO8DWTftZL7AH4EIyOj32vDd89kYJu2CWbDAp6ZrSJ+FolWtrfNQoW3SBVdvcP6tlxpZDL/svM7Jz8HqHjLm+545z0bHEH3I0aE01IaVOlx+S9Lt6WhUcLkFmPu2Ae gaPXUkDT eHpjg9ZE2HoAddjAEzNYMo8j8/YyQXi+k5DIpTqkQEpfTKU3zxXVIWDHy4YAgOYrEUFhrtROmHGvu5clY6AVS9Lo9YcbzCM2AZLqcoedMtSHNgIwNkEyCtSM3oQpcu8EQ/R6dmXd5fzhcOODF3rI3wsQeBJQQSLw5zq44eFhkeRnccQvtXXXCZe4ko9aKm01K4g7qIKhTi4YJUATUkwMtuDegX6Slz+RJDonXVzRN4uR+RRmH5SyPDYdROKVoNhLkDSfiOHuaTihL09LbxENTK7bvD/+SVw+V6sIfwHXxqMQIsCO2WB06rGmX/rLiDJCaemvfr8HhX09KcpdSgNr6y4XUfSy0tlQ7FheFcZFtWVklVt8sQz2yCPQIGlQD73ldGbvuVqz6gUAW9WzplJMfXDyJNy+NMalquhHgV7qOuOIYlAj59TNzrH3fe6u3JPN1dkcroEbMPXJ1ErdbfTFwMvG43nNgCsVv3dLzLvXgeYclOSbUejAH69TxRF6E1W1qaTQlwSwJ4jluaizoYlh0SxX5wDtGgguB/l97xOV3iwlx2YoyJcfuaO3KjhkOMU1tAtSh/mwGEJocxhtK+RWUaWzkcMkzmSKdYRxgUQtALTHRMYbzEG+bfLOIT/T/8/UYmNI9o4+VcADbwwVpjdA5b83xSz4RwqVpgdfC7fQrYdQ5O7YbU2EkGUFYfF3lEEHrbzUP/Jlb+Horq2T0HMdqIdPTfc6DCeepjL6K 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