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 9568DC3ABA9 for ; Wed, 30 Apr 2025 18:11:17 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6D6D36B00BF; Wed, 30 Apr 2025 14:11:15 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 685CB6B00C0; Wed, 30 Apr 2025 14:11:15 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4FF3F6B00C1; Wed, 30 Apr 2025 14:11:15 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 2D8E36B00BF for ; Wed, 30 Apr 2025 14:11:15 -0400 (EDT) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 76A5F1A07F7 for ; Wed, 30 Apr 2025 18:11:16 +0000 (UTC) X-FDA: 83391502152.07.DDE7AE2 Received: from mail-pg1-f179.google.com (mail-pg1-f179.google.com [209.85.215.179]) by imf27.hostedemail.com (Postfix) with ESMTP id 84CD840010 for ; Wed, 30 Apr 2025 18:11:14 +0000 (UTC) Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=gCWBhi7S; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf27.hostedemail.com: domain of ryncsn@gmail.com designates 209.85.215.179 as permitted sender) smtp.mailfrom=ryncsn@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1746036674; a=rsa-sha256; cv=none; b=uPxDalBNMc9XZj08q5CL1ckUTe3y3he4jFGIyDHpWcLLjMlhzYfj/srcKgD8gFFc1bx2QX kPZ8SFIjZApBlonLd829DkIRJNQIApmGP+ffdflOtzjhwpEQPhdCplLEfFt8DJDbOZ7s1O h8OIZeOgc/vvagcmvh3uMr5xGt5X6Ck= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=gCWBhi7S; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf27.hostedemail.com: domain of ryncsn@gmail.com designates 209.85.215.179 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=1746036674; 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=irx/3Q51rjJLcYI1yr6h3yaGgZhTJrbg0FGaRbdMShHrT1KN4k5f2UaHxY6aDKHCO0JVKN 6eevXwCo8SpKiyE6Ui1pBbQGr9tEq0ybl6cUn4iRxGiDiOoKIN4aZjsT1wepkDM31O7VHd vcJu7I2IGWuPP5er/YQrPdn7YupId+E= Received: by mail-pg1-f179.google.com with SMTP id 41be03b00d2f7-b1a1930a922so111305a12.3 for ; Wed, 30 Apr 2025 11:11:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1746036672; x=1746641472; 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=gCWBhi7S7mGiq6HsCjjOhnKCTQaKGAtO/Nmzo1eK0T5hFcpmmXGfYeQ0go84ska0sT lwD754NGgZc/6/wMQOuhsKtoCC/0EUvt5hvwDjdAfYJYVzDbC5qsBhUqo1tczs3s7zND 1//p/NvM/cDtTvOgce0DQSsdKsNyLKQqikJQeJvYCNhsi4msba2Ntuzt0CEnrCk20eu2 LgYB63UatIu63d3GnU4mlAe/C9iZndOq8139eQKi6I9sJD8yBxIEYopJnAt9ETguBLvU g1OqFm+YTOlKB1yf23jfUP+tVCaFYBeZca0xKnWO7HX77vCt2CZDh8v6CoUvLkCvwYKv vD8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746036672; x=1746641472; 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=w8rHZgFBGQo3ZjiTjqh502MU1WB61EA9IboHnijzUHXCktYZiXZZq2xbQ8F+xSKKot 5A7WCHXquTdTgN6Cf5ZEBhJaDcrdtAVdJylnDNUkOecSF0SOoaRKwHibtF84eV7A+1c6 8Dno9hXpSU22KhRAKIMEBsLm82OrSp/v7CGjGLut3QrkuWB+qZgyVPhfQoqL6C8danMu 7h75+VbCVXgjrFYy6Z9fi3FnQ5CBanyZ0xWcgDcW/AAy6NEe8EukJjHNUmg97wU4wzuK 00sBg+KLxXFpp1WDApvUt03ekPHdIFdHFDfUkXR75RcSU8sR+w+Cb0SJRduTdevyZmns yC6w== X-Gm-Message-State: AOJu0YwpFZhox1IIZTdSgFKRoSK27eutGxHOdBp/sgi2CFYKQNQNjSuL y4wMwC2nVg94QF2UkKFSV4Ag1U90oGcEbzRNbbKyDxyi1i2PCwBkC/Kt+ZX68AGlkw== X-Gm-Gg: ASbGncvlrSImGnd2iYqHV/Eio8GI+JFkR57O2kYFnHkDySVg+Uj14KtLgTV7C2JsY5A 8B/Yt4WxzTI0I5JzOFPfpi/yGXO2KAGXmY76deSZA0d/rZKg/KMCqxUOMPwJZCF3JeD1SD2Vz7l lRarr04ihxVx93LgDmeUPzUGcFGVdNsjqMiw2YBI7kgbcqg/pqr4dLpb6sjT6iz8NqXinwZysqh Uv08LH36/4q/QVcpYauXHtG4qLOtso8aT2YA30tnNr7sdul6bQswQtE7UUnvcGyTnOdiUT9I4tp XGcXt1sfdhI8+LHPrUiYycnO2u/l/2kCEmlEap6NuX6r7VeWEVmk8yiO1yUDCQ== X-Google-Smtp-Source: AGHT+IGPmIR52RvLNc4qp7jBDc7epoAkUWjSXFVEqnCRZkqTXLMSG6UyM8sVIbiZ/MbiNgWOBB70hw== X-Received: by 2002:a05:6a20:7f81:b0:1ee:d8c8:4b82 with SMTP id adf61e73a8af0-20a89419b37mr6855342637.31.1746036672506; Wed, 30 Apr 2025 11:11:12 -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.07 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 30 Apr 2025 11:11:11 -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 v3 2/6] btrfs: drop usage of folio_index Date: Thu, 1 May 2025 02:10:48 +0800 Message-ID: <20250430181052.55698-3-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-Queue-Id: 84CD840010 X-Rspamd-Server: rspam04 X-Stat-Signature: 5uy8bzukzmhp7pekqe7w4g3fq8zuiajf X-HE-Tag: 1746036674-978108 X-HE-Meta: U2FsdGVkX1/pBQDj4bES9/1y2VvH1arbmNJJoL6BkRrb/atoz1gF9yaRnlntRY69esylnVtuRWvaoNlM9twMpEAnCzIK+Qq1t4z5GAeFD5HtBy7rP0f7yH4FSVdyIvxe+Xvbq5sSKqrluBq49hLmfhgRiDB3DQ6/d5zE3keYdYUwWDd1shsIJ2WgzAMGdzoNYUP/AN5CjuKhO9DJXdzITtqDXXF71IRuTFSH63c+n5LJINYJBq56Gt3iO8wXpMcK5z8vWRwhKxWN58qdvRtejI2BYL+lkRkchNouybWAIcOILsmJLmaHcmQ6EoeprVZkO5wTao2bctkqSNUDPmaG9nvm1eJQrO9l6WvGhPsZBnUdR/MtTe9ejwPeth27NcJd2FyWVRZW3woRxeJ/GLrKRu3BuS6t93XWpm7Cc5Ax6Q/5kde8bBnDFSb2Cbia9OqlQpDjrg0j54/P63X+QgjyP6RmQQBV9qLUHt/Nfb/ZyHE9U+zt1iYcTbJ7Z/Veryfq0EEfnNRasq+j34yHQ3z/SnJr63kOaSY2HN3+sEB2PB6HoC+fP/4vK9z3/CpIYbUNnid3S1Ga915QwkC/EzX5LN0BWaNj4En+dgbWeMYUb4jF6/NYaLRvs/1SrZHexxkLbMAeUytefHDJRb+/gTckpqR7ayhpJADTzNh1/t2BlDT+P/L25AyVt0F/WPzYFtiXaK/tBcYIvpWuwLHQFLqa7JKyyHGQdluLGK1INNr4XyYZwYloy/EGv8Pd8iQ0mryxPTlHUPcwTooqqAkgZoabcz2sjm0AWn19UUqV7w6rUYMKlPIgQGEWy/hCECqHd5A1uDa2g3Ow0hqRYhq33zyggqaPeetN5H+fYZeB7Jul8PmSJ3SAsCoAuBwe7pWp+6fXfsdQUceYPjEK6kJkmAh4a8yO7ndg5FrPIuvYk2yplRQIrYCzb7g6+EuHnjW8/6V5c4i6yKiCj/wxGpklwEZ lXjhYHWC qOnrjWBiVjfkNbniNhtJ9bRUdZSTE/UcAmL9QpyXQgnREqfekh+e9ArJhNqPu+U568+wSjPqEtveBxjpDJVn1ORaT6d0U8CMrTsuX3yxBFNa3p91A1gjKa45ToRN6BHQH7qmABTmYcy4jEj03GZJ8dnEsRr3mjuIhSHwWZniXs2N76dbkqXCnVMTvglPZpf6uL+c8kQkf78l3OSIkfOibCQgvXbVKydeS2MMGCpDZeaW+sPuez9tqmZ5if6+zEfcd+fx7/qtzPgiGoARyidDfDSWOKyH8hyJkSEscjDkC16x86NZYsITmoE3rou0qAJCkj0/oZQ+KpDP9sub+4AsrXlSuNVHiMjlHjLJ4FFaNXC7EG6LPXCtEnWJv45HEfixmxRPtcGwXynX8wgEU2BMrgC7p+uLx4Pbj+A1nR8qMBKXIxPO1yNUVfuN6ildKAsK8RZgw+hHIrPOMvmlMvofhQytYQIxmbAhU3B215Z1eqpFp9zJusEouHLN9543/OJs3P3w1aNR+W3Dc9C2HhOilYZeydXnNdD7kLi9DOHLzqTkHvI3U1gJYiCLkfm6Be6loSj+yRLmrhRyoKnY9jGJNIhW+uiAMTS8tQIzdahDe+LLqy3dorOLo+SA6OYtai7mH8gGbk3oxie2g4vNY4LlsiEAvP5mObBn2LNKlXUMRrhk64y2QiwoxpJd9MI2wC1I+w/8TAsi3vJqnoax6u1Ipi82e7somKY3Kjaay566xbQviicG25lXyzQM77qX7doqDBsRAULXVtCmHfqrbVWO9y66li7mxC4LP+wlmrJBsqlniTtfLDEdhDNG0IV9K2cA5v+yA7+fMTPrgYzvwOY3rF2XSqFOla7KZEv1HvmMRHQAq6mDeS8ZSJQv5DQXFlyRn+I+n6G+RPvQKHy57UvwiNgJJ+Hlh5Bnn5mgnqwrjlyGU0tC3+1JwKpeOc/+5rnY2DGFUm1KMKg9+ztY= 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