From nobody Thu Oct 2 14:24:03 2025 Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BD5AA33EB1C for ; Tue, 16 Sep 2025 13:59:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758031185; cv=none; b=sOcOkTfydkWq2jQSbplIaWHUZOdWxowf1x3gkqDk1tCsJ16UO/eUaBUylXYsYqYfQK5a7Zls3ne41Zy7HQS8YvGNjFP85xrukgPeCT+fQMn/YVmZ2tTLx24GO/FRNxa1AhFbkXdbZg8RNMq1mkN1952Snq1tafPRhAsgVKly4nI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758031185; c=relaxed/simple; bh=Nc3Gee0vrTnwJ6vndyB/379w2+GYqChkKGGXlbOU7TI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=MHGk9tZ3DnTC4FOAHqKkD1EBnPq2IX+czIGDHB1rL5/X+7Nz+EEp7Gyy/7F3mnwpHGTDLPIa+Z0+JMEpZqDZNZvwo2Nm9L2MXPb1IkGV5K8rFnYoqNTcqcpp6lD7NhFDDsg6QFMTuyHxVzIJ0GcNrPHPrEcWtgUFBdpPvnHaIMI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=Bfy3Z2aZ; arc=none smtp.client-ip=209.85.128.54 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Bfy3Z2aZ" Received: by mail-wm1-f54.google.com with SMTP id 5b1f17b1804b1-45ed646b656so46878045e9.3 for ; Tue, 16 Sep 2025 06:59:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1758031180; x=1758635980; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ZMpr+bvOy5/2/12diBRSepmR81u8HtS5BLKXmxw+l6c=; b=Bfy3Z2aZLBnOB8OcwpmFwYOu2POPQiCG4qrDIkeZLAq85nJOPv1oMvqfVaKt9AsC3U 3Uktntb0t45qL8UPokum8BSzilCUJhZhCsH8jPMbp2A3URiWK/XkKMNL1aZ8ikktgwBC FBu5TXgeNYsuIf4oWRiw/mUKTgisVJIz65TMwWMF5XFrST7CGgysQOapTPSkeY8OB1Po bHsoKAuX/XJXtM9D3Q2LAeJGNG6408NFZoxD9aTf1YH3tTR3IOlipopr6kYaWogera6L CkZKsIFl49pl06CdVK62sd9Pg9v0yido6U6u3FZ6zBiGjqPfOhiqLQ+7oAV6VRsKGfyS Dsxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1758031180; x=1758635980; h=content-transfer-encoding:mime-version: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=ZMpr+bvOy5/2/12diBRSepmR81u8HtS5BLKXmxw+l6c=; b=LLEeBHw4MK3HogZl7yE8J23jKWb10/bu7zF2r5Cd6pD7EiAhzNyPS+KBVp+MVmRidf ueiVxSPmueYSW5unkz+uHmY6lyUswn0tgCn+UWxHq5izoBkx+/rMUabTlOtk9PX+KDt1 GiZHkKvHClPP94j/NP98eyxPZEyMoCuF8VdcEn5/UZECmh6pCIUWYvE8mwYm/SBW5NmC UdpWTVYOaU5+ip+ZKA6nSjZdYNK/8fuetyj0IcxHJp7bosKa8pVh+jvqjeGrILazUN60 +eidV80A7228DTmY6ieWgpDQphq2KbbMcO/8D+dCq9mUtCSaB8/xOUxNtjtuYt2qiVeA dA6w== X-Forwarded-Encrypted: i=1; AJvYcCWAsNQ0wi6UELONY9cqxI2Tl2LQxLXa7aEP6u4SgmufHj8om8Kfk3ID27Xylnqsz7IuhPqTG5zqzN1HCQQ=@vger.kernel.org X-Gm-Message-State: AOJu0Yw6Nl7pamszhgYfpTNF6OwhJvtsxmEV1BHMthUKY7HKmmRhTMP7 Ht+44AWixPbsGfAuHbPtaD6nN4SBrxaMoVvxfJehFpfd3cl7oZHAeQhI X-Gm-Gg: ASbGnctWEeKQpil8CZH0slnkQVDV6LC5YTt9z1XdeWKqaQTgFysQzuC3w3VoqM0TFqA +Z0OVqQWjHf3Wg7jveJN5CB1wdaRjelWywEnhLJz2M+5TafzUhmx7GEcZSofhE+70cpy7bPV1Ww F0you5eFvvgnqtv4ozv2dgwM730MbWICYqtjIx+rbPf22pFmEHQ3EkoVL40N+eCkB0F2ZvQ91Gp ko7KXZP0hq9rPIH52AF2YszO9w0K5BLIYO3/7KbNYCZokhnpABFGGPclTCnlxmPSA2yxL0S2DiF OYQIcAjW+846qJbOgStMzTmS7i2wF7ToGR8hjLvYotFEo2WEuob7QH3vc0FFtsb+mv7zcSM0LnK 8slMQ524H5xF8twFVM6siY43ARigYTxCm8QV3Bj+qzlJ6SXgzd6fqiYA6cVEBNi1KYVtEcMFWxn ob416OqCo= X-Google-Smtp-Source: AGHT+IFbHxr4sMvLl74+5elP/3RKStElte34B3ctaItgubMLw6jX0shTLa+rud5mii4r4ob7vh3LMg== X-Received: by 2002:a05:600c:1d20:b0:45f:2b47:b06e with SMTP id 5b1f17b1804b1-45f2db8764cmr67166895e9.18.1758031179775; Tue, 16 Sep 2025 06:59:39 -0700 (PDT) Received: from f.. (cst-prg-88-146.cust.vodafone.cz. [46.135.88.146]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3e7cde81491sm16557991f8f.42.2025.09.16.06.59.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Sep 2025 06:59:39 -0700 (PDT) From: Mateusz Guzik To: brauner@kernel.org Cc: viro@zeniv.linux.org.uk, jack@suse.cz, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, josef@toxicpanda.com, kernel-team@fb.com, amir73il@gmail.com, linux-btrfs@vger.kernel.org, linux-ext4@vger.kernel.org, linux-xfs@vger.kernel.org, ceph-devel@vger.kernel.org, linux-unionfs@vger.kernel.org, Mateusz Guzik Subject: [PATCH v4 04/12] btrfs: use the new ->i_state accessors Date: Tue, 16 Sep 2025 15:58:52 +0200 Message-ID: <20250916135900.2170346-5-mjguzik@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250916135900.2170346-1-mjguzik@gmail.com> References: <20250916135900.2170346-1-mjguzik@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Change generated with coccinelle and fixed up by hand as appropriate. Signed-off-by: Mateusz Guzik --- cheat sheet: Suppose flags I_A and I_B are to be handled, then if ->i_lock is held: state =3D inode->i_state =3D> state =3D inode_state_read(inode) inode->i_state |=3D (I_A | I_B) =3D> inode_state_add(inode, I_A | I_B) inode->i_state &=3D ~(I_A | I_B) =3D> inode_state_del(inode, I_A | I_B) inode->i_state =3D I_A | I_B =3D> inode_state_set(inode, I_A | I_B) If ->i_lock is not held or only held conditionally, add "_once" suffix for the read routine or "_raw" for the rest: state =3D inode->i_state =3D> state =3D inode_state_read_once(inod= e) inode->i_state |=3D (I_A | I_B) =3D> inode_state_add_raw(inode, I_A | I_B) inode->i_state &=3D ~(I_A | I_B) =3D> inode_state_del_raw(inode, I_A | I_B) inode->i_state =3D I_A | I_B =3D> inode_state_set_raw(inode, I_A | I_B) fs/btrfs/inode.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 5bcd8e25fa78..eaf3c20e5b23 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -3856,7 +3856,7 @@ static int btrfs_add_inode_to_root(struct btrfs_inode= *inode, bool prealloc) ASSERT(ret !=3D -ENOMEM); return ret; } else if (existing) { - WARN_ON(!(existing->vfs_inode.i_state & (I_WILL_FREE | I_FREEING))); + WARN_ON(!(inode_state_read_once(&existing->vfs_inode) & (I_WILL_FREE | I= _FREEING))); } =20 return 0; @@ -5317,7 +5317,7 @@ static void evict_inode_truncate_pages(struct inode *= inode) struct extent_io_tree *io_tree =3D &BTRFS_I(inode)->io_tree; struct rb_node *node; =20 - ASSERT(inode->i_state & I_FREEING); + ASSERT(inode_state_read_once(inode) & I_FREEING); truncate_inode_pages_final(&inode->i_data); =20 btrfs_drop_extent_map_range(BTRFS_I(inode), 0, (u64)-1, false); @@ -5745,7 +5745,7 @@ struct btrfs_inode *btrfs_iget_path(u64 ino, struct b= trfs_root *root, if (!inode) return ERR_PTR(-ENOMEM); =20 - if (!(inode->vfs_inode.i_state & I_NEW)) + if (!(inode_state_read_once(&inode->vfs_inode) & I_NEW)) return inode; =20 ret =3D btrfs_read_locked_inode(inode, path); @@ -5769,7 +5769,7 @@ struct btrfs_inode *btrfs_iget(u64 ino, struct btrfs_= root *root) if (!inode) return ERR_PTR(-ENOMEM); =20 - if (!(inode->vfs_inode.i_state & I_NEW)) + if (!(inode_state_read_once(&inode->vfs_inode) & I_NEW)) return inode; =20 path =3D btrfs_alloc_path(); @@ -7435,7 +7435,7 @@ static void btrfs_invalidate_folio(struct folio *foli= o, size_t offset, u64 page_start =3D folio_pos(folio); u64 page_end =3D page_start + folio_size(folio) - 1; u64 cur; - int inode_evicting =3D inode->vfs_inode.i_state & I_FREEING; + int inode_evicting =3D inode_state_read_once(&inode->vfs_inode) & I_FREEI= NG; =20 /* * We have folio locked so no new ordered extent can be created on this --=20 2.43.0