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 13E39C369DC for ; Tue, 29 Apr 2025 11:50:32 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6A4E36B000D; Tue, 29 Apr 2025 07:50:30 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 650F96B000E; Tue, 29 Apr 2025 07:50:30 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4A53B6B0011; Tue, 29 Apr 2025 07:50:30 -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 25AF66B000D for ; Tue, 29 Apr 2025 07:50:30 -0400 (EDT) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id B46C4CAD7F for ; Tue, 29 Apr 2025 11:50:30 +0000 (UTC) X-FDA: 83386913820.03.6F2B81F Received: from mail-pf1-f173.google.com (mail-pf1-f173.google.com [209.85.210.173]) by imf05.hostedemail.com (Postfix) with ESMTP id F3EDF100002 for ; Tue, 29 Apr 2025 11:50:28 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=KRKdIktc; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf05.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=1745927429; a=rsa-sha256; cv=none; b=Cg69m1Xv4pV6ZLH/NSLdgYdpMID3f03eRhtT1W3BFKnm2P2CuXodSaGLIc6lA+jmoA1R5X 6mHv4Z8uIvAy2mSigeqyOIayaCVloUWa4IDMMxjBQRXtW4rcxZwrlBZ9UTTnLc+USeIiMT tg1+zmBUoft0lHzfOzxBfKpVM8oq97Y= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=KRKdIktc; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf05.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=1745927429; 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=tq3nEj4DUSPSU3dXBHWbYOiByd1+bRHGbfykzSesdrc=; b=S8gu9+A6lX1A9ss3h8fFMXdtlnQNG/286ziQ8Qrzv1JmmLl4P/IeIW+82V1zjQHWeREO3x ZUSF50mYw6DtBkXoWt0tlURbfq3SibRpf7FC3E+iy18f0BYk6DJMMk4UyHl4tsl+zjfzBq VG3MhKRPUmbocHo+c7HCxWvIL/BoqHA= Received: by mail-pf1-f173.google.com with SMTP id d2e1a72fcca58-7376dd56f8fso7908220b3a.2 for ; Tue, 29 Apr 2025 04:50:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1745927427; x=1746532227; 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=tq3nEj4DUSPSU3dXBHWbYOiByd1+bRHGbfykzSesdrc=; b=KRKdIktcE9uzKyXQhEYDt+KtX1Mm1IxTSgBH+EJ5B2H3+ogV/lxgN4fhoiPzVpb62x 0FS2lzj49MSXBKP0tctg/QLNlksSxh9IiKMg9l6O//DlD8T0Q/GkNS1xtFYGU3CEeYfD ut5NA0IsqS4TK0HL0vi/H/6Tdm3I/pfQf6mL0YMPfNtJXsSr1QwTH7FFEvsVuT7v+3W+ PhlDBZfHb0SpOWtlZmpgBKT/2oU/rPLPndSw7aYMXZTnPpdBsQlpoWa/TDxCBuEso9B/ rGK9ZS9OVBjkt6QfPN6wzdsDzHIkG1TwHCR4koIEpk2zdJ8y2Hm3qKWNeLwGHFnym14l 5Lww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745927427; x=1746532227; 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=tq3nEj4DUSPSU3dXBHWbYOiByd1+bRHGbfykzSesdrc=; b=SzzhoplxVCkp6V75ZwuhHePfphTcMcPHQXYHOpw51pao8MyVY2wEqUFqNediUOttUP jEP2rxTWZOQbvXizSzRDVV/eeN2FbGH42xPapyi9DceMqzoqX7G/NX6M05lqq47UalRr ETJR4AsYL/mJ7uVuUdc9KxTzcyiSOaxndknVBSrVFvWKjBx9M8FFv4lsRYbxQb4cfMes qPpbZr8RZeRa8bxRO3elfhNjus60M2Fou9bPRLV2lCBnOvNQZLU82DjngUk59kOcVKEH vY1AOAYifL+bolF3AX6tRQwZJzulnGrpDcp/FLg9kSipAgkUbdKD/napCxx+MPGxv3es x8TA== X-Gm-Message-State: AOJu0Yxkq3Seu99mkDjCXaP9VuvqDee3feEJe2lm8FBdHHxGMvB4ZE+p SgsoxJX84dMMuZzJgPdC2yBlTbbLeeecZmPoF4XN45yTHpL/UPNa/U7RzWG6 X-Gm-Gg: ASbGncvx/eZvjxCfqqOYv4hqrOHUIG6P4c212FF98hs7m2ithtbW7zEi7TuGpRP7lcZ wyAFDQcpy+xzQmYYC/0o96ORshaIQiIAqMudse5fx/mNyDMb2Lc7V7V7UP28+xTT1/6ofBnQVd+ 58AYTuSq0jvqJ3/KPQEkbBzhuWDTcWrjXVi+HtMJFSyZ1hqn+8aj0ZF1Z8qK/GR9cOKcllNkEPi 6aHVn2EBQhVuVGwy3SVADiAG1csmk6obRky/kwVVUFfSqKg7X72FPfjL1stu3Rff9EXr4jNgDcF 7GqIKJARYmiU9cmzWdXP5beEFsnYLnDVlcfgpx4Vx03rKluTblP+r+D+6bOuHSoMtWu0Rrg= X-Google-Smtp-Source: AGHT+IFceGviU6cyFKzyG4aWjdQDKx3Cfc2HEqFWBXzPaKs+4WEXEA1l8P+G5QoBnkrWzjUrg/mxQA== X-Received: by 2002:a05:6a21:3a44:b0:1f5:6e71:e55 with SMTP id adf61e73a8af0-2095907d1bamr3893991637.6.1745927426869; Tue, 29 Apr 2025 04:50:26 -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.22 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 29 Apr 2025 04:50:26 -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 , Chris Mason , Josef Bacik , David Sterba , linux-btrfs@vger.kernel.org, Qu Wenruo Subject: [PATCH v2 2/6] btrfs: drop usage of folio_index Date: Tue, 29 Apr 2025 19:49:45 +0800 Message-ID: <20250429114949.41124-3-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-Rspam-User: X-Rspamd-Queue-Id: F3EDF100002 X-Rspamd-Server: rspam04 X-Stat-Signature: crx1komh1nkbb1361c8n6qzp4qbt66gs X-HE-Tag: 1745927428-699849 X-HE-Meta: U2FsdGVkX1+RH0s/T/dM5ODgM/JzMZMqmt9PBVG6ca4Jje5Kpl5oASqWe18pzRwrE3jdDzdFNgmBgu1HX0KgdO9qHzFuMzU020W/cyYTZCbzSaVJSmoQzxiB425l2GksFPym1e3QMR37koJ+9tWKeLIh/bChe6jGmtIfLnqCuo1dnmAGJQP8uedK48Os9HJ0ptyoMgYkwEXfwwq5r1cW56asCWUINEetKL4NFIQ/qlWev0ANFYHkiDWQ8iME7U97NwRqmnULa+yIbBaQatO8oruoX3ckiN5dVZkLub2VX8BUXzj9Z0HBYmW4AnJU0epQBEd26BkoIRvk8LfcfZbxP7MPubQuGkn+CU8gTSJHica4Y24uwi/t5YmqrSsQc0FwEdWQ+oRhrkhH0ld727V10omlU65bXN630SO2WQCAzOZZynCp4eUnRxop0oH3BQAa5ZoVHbNHcKiYC+yMhwMJvEm2EhFehFxPz3yWhfqd+cuHCC69XuSyMwshD8KzWeoGNuX6L7KNPYe82WbVqjdw1X4pwvNKxcubZ0WE1lGsdRQo+WM+QXlomJe7lHExeuVeasjzO5BEzRkDwWjgZKIBcSjnDca+8xoGX+Iw02F/GzMrpPTYehbDzY4IxBiaIS/+vnE+YBgC13NYmTjHjkPrYguy2mXhjV/qImHWPIQUGHWhPUmYbQOFW2KIKgPwcR6bb5cJ8bdPTlNB9MOd9hfx1I1B8e9OEpdvCEaAbZhcFHCjRgi1J3NKHfJgG1wlOQ7TZYBEUcpDM5/0j4cbdNJwdgOe4vyv0Fbp4+WHVDKYjIKRQQjsCY2d9IUxR3biI+4SdQCos9W9Bt+6WdVpkVf+JMAXbLTaf/6z8SBZFatgGSyrzj8t6gC0aSj3tyerVZ0PT3m3g2WKNhbS0mDFnlin4t3EL0n380NkCHRk+imVTAwVYijyIninTQWHOUUYwUljlw6Xeb9fxl0kthaOssm 2qQeNlYL rtDzmnvj8Bhfw5V5LpSvz0OrJTEVNpMXa47gKn9V0Ty2spMFg3PqUz2Qbz1erbtOCVRjrWSMNv0PUv2ZN8QDYzuvApOiYMxgEtz13gzPfEHSTbiggS5WYB2/KlNADinFJaq88ZuTWKkeHBdkR06N+7P/o5FSPWNehikBRhdjByloFgaFm9SodSPwwZJR2BOH8OqGRWW1nnvDRGSwoBg0xBIEbNU5Cl9P34svFfdIkEgwWbWkfl3XvYM510eN6jqSqvNeisS66X/y/zhY= 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 btrfs does not use that method for swap. 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) Reviewed-by: Matthew Wilcox (Oracle) Reviewed-by: Qu Wenruo --- 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