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 A2CA2C369D1 for ; Sun, 27 Apr 2025 19:00:18 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A42416B000C; Sun, 27 Apr 2025 15:00:17 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 9C91A6B000D; Sun, 27 Apr 2025 15:00:17 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 81C1B6B000E; Sun, 27 Apr 2025 15:00:17 -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 55D916B000C for ; Sun, 27 Apr 2025 15:00:17 -0400 (EDT) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 3FC681209DD for ; Sun, 27 Apr 2025 19:00:17 +0000 (UTC) X-FDA: 83380739274.28.C7CBC54 Received: from mail-pf1-f176.google.com (mail-pf1-f176.google.com [209.85.210.176]) by imf07.hostedemail.com (Postfix) with ESMTP id 5BD5940003 for ; Sun, 27 Apr 2025 19:00:15 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=GXKd0Rkk; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf07.hostedemail.com: domain of ryncsn@gmail.com designates 209.85.210.176 as permitted sender) smtp.mailfrom=ryncsn@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1745780415; a=rsa-sha256; cv=none; b=O9koukflIrYDWaIb0/ogvLHG8gI0zZM+wYPYw72FDzFHsIAHyJPVKdRP8lywUyiNw9qAaq jkmtg8H1fKSOayjAMpBEdGn1BmTzPw+Ck/0/yj02W4lyS7Z2Y/sFfEyXxUjVy6/9rjYfNY eD0QjavUNGGm0uqx8w64PChPBrLpIkE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1745780415; 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=sjYvr+yA+zdWfNHFdWRXavur5ow2fufmvm69FNNW48U=; b=KAPhzrHEjSffe3WDnzVqKe8e4ZUu9CeJ7BWLj77cS5drO7q1sjR1oSwLeC6gsayqeIQ9D/ 0vfxSc4oRn/rKdCpbOz+Z9aIYKGlBJ9J6PkOlQssupUft0kAr2IYsResvMljM0nXwguGaW lv8QBCimDTrT5hEiQ202T26c3QmokC4= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=GXKd0Rkk; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf07.hostedemail.com: domain of ryncsn@gmail.com designates 209.85.210.176 as permitted sender) smtp.mailfrom=ryncsn@gmail.com Received: by mail-pf1-f176.google.com with SMTP id d2e1a72fcca58-736c3e7b390so4109323b3a.2 for ; Sun, 27 Apr 2025 12:00:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1745780414; x=1746385214; 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=sjYvr+yA+zdWfNHFdWRXavur5ow2fufmvm69FNNW48U=; b=GXKd0RkkFLGxM5CpUrkJa+heH2XoQ8oFh5wPnbwVSIiGTbqLHXqMo1mxmxIL28PFS+ AEE+ysjr5XDvJwTJtZaWyL159r+uILIesHPjSApfuxfLQD6cba5pKGY3rdSulxBU6cit ECNP2y8fyUsan8d0owcgJR3ccqXXZsq6LPUvGzkHolYgk+EBHYfU8X7zD+kQjRkc9SSw 1crPLsdAPJsXVrYWYoSDSJ78yzREeQmiBXh/A8UofTQWq0ulJAaTBJdZ4QiNjSa/2m6y t1AeAIvcgZ42807w5m/5wf+IfXnIo0qcjV8Rla/SH9EVpnkWngwbIMWrxjTeDk4ZIaN+ 32Kg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745780414; x=1746385214; 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=sjYvr+yA+zdWfNHFdWRXavur5ow2fufmvm69FNNW48U=; b=mV90qnfPPmM9Gt1bMv35fTV7WmmOiCrl5NdAsdCt8Y9wBAyTSdfYnpVslA6YE88uuo zwrSXWGL9PM9wgfndAGL9IbZOobyNyrXwxEgka26jZaQhlzvktTLIimdLHnhn8pMUY/7 JdcpyQHMooDrvXBIm0W21XFxF249u/QQgFJtoR0rSmpfjNHxYNqEHQEMJzdzZIIOokSQ 451oM+pP6WFjW6MBRiL9q4L8MjvlzAnFeM5v3EyTKjQ7CQzMLgmuigPLdr12BJt4mZ6V gzLuEJIsnVWdSfMJT1R7gKUROPAi+sKF36jTyQpFDuhJlT6snxekbl9LvhYPCUeoONjV RdEg== X-Gm-Message-State: AOJu0YwjGSleYSJLkp/4Eadk8xCZzq/pixt9luxoBJObJY4Tn//WWP47 dOdBITr2DzetwJaFW2sZibjH+wPNicprC1CZtPBPSXhX4KzFJJcGQqDYoZbmiN4= X-Gm-Gg: ASbGnctnJq9Cn6DbqDx4OKmbaVMJJS5AEsnuYO24kfkimV7jZof/Oz41pQQvZSJF5fF 6s92JFuSBRr5BHqytLYnksBh/hYkwvf35RvVsMdLcSPoEuVNsRZtBFvJCCDMVq7rC8rwcXyVDRZ VxHvJwBct5bh/UsFnZ5RY3cngjCMwJr6zQ+Qz0AhrFoTUqgiqH6YgF2s+JEvBae/Txw8s9BLFhi 37zmgdsI4JkLnb8bSef7Rx650XfDGg/02yvuJTJ+km6V/3mj6XMz1qyhBEsJbuoGeL+aO/0Y1oA QHdQOIsLL+aPXReBhrXc6qBw+QXO4NhB24Df7J1Cbyqfjh2oMU9oYalm53WuSFvnVVEsMfhY X-Google-Smtp-Source: AGHT+IGqp/hwdsuDHXNECCCGo0RS9+jH9xdWghKghtAN8mLfYvPhaOhox/tezpC0KBjUwj380xdEDw== X-Received: by 2002:a05:6a20:d817:b0:1f5:839e:ecdd with SMTP id adf61e73a8af0-2045b6960e9mr12016852637.9.1745780413622; Sun, 27 Apr 2025 12:00:13 -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.09 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sun, 27 Apr 2025 12:00:12 -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 , Chris Mason , Josef Bacik , David Sterba , linux-btrfs@vger.kernel.org Subject: [PATCH 2/6] btrfs: drop usage of folio_index Date: Mon, 28 Apr 2025 02:59:04 +0800 Message-ID: <20250427185908.90450-3-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-Server: rspam06 X-Rspamd-Queue-Id: 5BD5940003 X-Stat-Signature: g9nb68nbh7fmtgjume7upafc468pziur X-Rspam-User: X-HE-Tag: 1745780415-240550 X-HE-Meta: U2FsdGVkX1+iQsHX0nj7pGeNuWbk4hTFVtgHxEpTAUAr/66Nh19K+ddFLkJBw72eO6ptFmEMg/XNBkJlWw0rHs5ZbsDxqyfi6jTXpOpdx7gaybTsprSyJVGTst/UehazySEiMH4BCxojQVMgrSzQ13Vc/c12lbHJUPY2l3bZvliDAYVuUIVXZmdcsn5xLgy8yquIrRYPgWPRA6oHDEtQ9lZKx4gWpJORbuKCMv8S7pPl5uJr8hGUae2+thmHTRFHr4mozxAEOX1XLE++5S9Z1TtGxY85f2505i3jHnOMYBEKupZwjt2j7ngmF3Y8zZtRpxfFo04EbRGCgtTBFqTM3Rt6kIoyaZrRXkMwJeDfT9UBecglCND/qWlPsxxMawLdCLQfTwp2X55vYmTYr5V7Y47A+qeqOZKNrQjxDZGl9uOghQOTR+F2YRPxzwH0DR9t/v6LCDlxOoEQrQQJJ7zt8C0WP/4fZ3eOLhY7ExfYA6OkqF9Unm4UPFTiQ3BIPaS1UeX1j+PFUVLf/qvGVRCJVNOX0OQnQrNOPjMbaO8R9ZWan4es3OdQCO8MdR9mPctwlsqnz6aa/9oML1egGb5aCgyp8eqZAzexLSKoPf3rqEGj4QdLoM0/3orhgj3kvYAg0NMqL/Ivo2JIzooehTN23hZ8NmMTCDQ/2QC1ktqdJUzSzvZxX0GWcxEtcerHSQYgpjUdkCT+Mvt6mf2NVVUI2OZcOo+9mKuXorkwzyp/UrBEFofAMEeBujYNTNFB0xFWSzfZu9UaWKBxY2ngH0toUxQjFeqihzI3aOv1ENAwJcKGhjBqRrPe+o5zNpz9jEb8Koo4ECUSSuK6/rXCU4dQodevdEyLw9ztGFbquvJWeZar9l85jrowngFpiirGUop92u1WIWpW7HEnz5QRUvBy89EvKvXQkr7T7L7eP8ky1MOylVUodVyepsDFf/jAs61xslKkv8r15BSikI6hIMV 8ka7nmN1 oKqx1HSv1yxV+4M/0JQoihAlytKUpA66vshX0y2SkagEuRy0JxlWmNUwilepDUlZ3MhKxFySIj8QWsux3qL86JhrwUE6/wLaZoAFIbGk3SPbGULbP9pxybrewj4Ka+lFNHRE1Ovq9q+AhOrzVJ+jsHXfStP1irEKAlCmWBCHgYPSCQ22B0LIzfweGxnsMzhi3Wom9D+EaS9cRWD/NddHuFLNnyTJsElqBWuBUqIRZkNmY/iam+7Xl/VPNSOyQgdXWO3h2ox77TjFfMbDELbhA5F5JwLtf9fxlg0j50RyyEv4HYrlkAgmphgzNSh3qFe8dBgOhefRcA6yO1m9Fg4Hf9uxsCQDzaxd2SHw987o+KKJ/BiunO2uNEV3j5cO8m7jNEty4cMvWgK3IoIJIsEiE98cUuni04OoO8CKH5hzFVfSif+Tsp7v7A+IjQK14LUWB02zjTXZCExJilkUZzireYlSooFRKXYMHMsMUn+1W0OfNxpBzpVskSkwHL/G1ZwwSEsy/+K9fA7ihispcsH3MO8lvqb6frI5XOPVkopOEhLA0nFg/2CewsE0HH+Zsnlyj8/cSIapLoby4oCzuSejN21z09cZnsfCgvYi7tv7QDXaLsVuWU4lrWl0IP+SwMouvvnUyv5Q3KdHG4UvOosZJQU+Lj+myFyAbjWUN02NdNCcRDCVZo6UibPc5gHzsS8fFteLx8auvZR9YcZAUXi/26uBj/YnMLPYKg+P1/R0gHQp0Tc9XhInNbSrfjgCcsvDCHtNQuIYtJoOS7UbgCYmnwxX4Zg== 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 btrfs. So just drop it and use folio->index instead. Signed-off-by: Kairui Song Cc: Chris Mason (maintainer:BTRFS FILE SYSTEM) Cc: Josef Bacik (maintainer:BTRFS FILE SYSTEM) Cc: David Sterba (maintainer:BTRFS FILE SYSTEM) Cc: linux-btrfs@vger.kernel.org (open list:BTRFS FILE SYSTEM) Signed-off-by: Kairui Song --- fs/btrfs/extent_io.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c index 197f5e51c474..e08b50504d13 100644 --- a/fs/btrfs/extent_io.c +++ b/fs/btrfs/extent_io.c @@ -3509,7 +3509,7 @@ static void btree_clear_folio_dirty_tag(struct folio *folio) xa_lock_irq(&folio->mapping->i_pages); if (!folio_test_dirty(folio)) __xa_clear_mark(&folio->mapping->i_pages, - folio_index(folio), PAGECACHE_TAG_DIRTY); + folio->index, PAGECACHE_TAG_DIRTY); xa_unlock_irq(&folio->mapping->i_pages); } -- 2.49.0