From: Mateusz Guzik <mjguzik@gmail.com>
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 <mjguzik@gmail.com>
Subject: [PATCH v4 04/12] btrfs: use the new ->i_state accessors
Date: Tue, 16 Sep 2025 15:58:52 +0200 [thread overview]
Message-ID: <20250916135900.2170346-5-mjguzik@gmail.com> (raw)
In-Reply-To: <20250916135900.2170346-1-mjguzik@gmail.com>
Change generated with coccinelle and fixed up by hand as appropriate.
Signed-off-by: Mateusz Guzik <mjguzik@gmail.com>
---
cheat sheet:
Suppose flags I_A and I_B are to be handled, then if ->i_lock is held:
state = inode->i_state => state = inode_state_read(inode)
inode->i_state |= (I_A | I_B) => inode_state_add(inode, I_A | I_B)
inode->i_state &= ~(I_A | I_B) => inode_state_del(inode, I_A | I_B)
inode->i_state = I_A | I_B => 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 = inode->i_state => state = inode_state_read_once(inode)
inode->i_state |= (I_A | I_B) => inode_state_add_raw(inode, I_A | I_B)
inode->i_state &= ~(I_A | I_B) => inode_state_del_raw(inode, I_A | I_B)
inode->i_state = I_A | I_B => 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 != -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)));
}
return 0;
@@ -5317,7 +5317,7 @@ static void evict_inode_truncate_pages(struct inode *inode)
struct extent_io_tree *io_tree = &BTRFS_I(inode)->io_tree;
struct rb_node *node;
- ASSERT(inode->i_state & I_FREEING);
+ ASSERT(inode_state_read_once(inode) & I_FREEING);
truncate_inode_pages_final(&inode->i_data);
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 btrfs_root *root,
if (!inode)
return ERR_PTR(-ENOMEM);
- if (!(inode->vfs_inode.i_state & I_NEW))
+ if (!(inode_state_read_once(&inode->vfs_inode) & I_NEW))
return inode;
ret = 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);
- if (!(inode->vfs_inode.i_state & I_NEW))
+ if (!(inode_state_read_once(&inode->vfs_inode) & I_NEW))
return inode;
path = btrfs_alloc_path();
@@ -7435,7 +7435,7 @@ static void btrfs_invalidate_folio(struct folio *folio, size_t offset,
u64 page_start = folio_pos(folio);
u64 page_end = page_start + folio_size(folio) - 1;
u64 cur;
- int inode_evicting = inode->vfs_inode.i_state & I_FREEING;
+ int inode_evicting = inode_state_read_once(&inode->vfs_inode) & I_FREEING;
/*
* We have folio locked so no new ordered extent can be created on this
--
2.43.0
next prev parent reply other threads:[~2025-09-16 13:59 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-09-16 13:58 [PATCH v4 00/12] hide ->i_state behind accessors Mateusz Guzik
2025-09-16 13:58 ` [PATCH v4 01/12] fs: provide accessors for ->i_state Mateusz Guzik
2025-09-16 13:58 ` [PATCH v4 02/12] fs: use ->i_state accessors in core kernel Mateusz Guzik
2025-09-16 13:58 ` [PATCH v4 03/12] fs: mechanically convert most filesystems to use ->i_state accessors Mateusz Guzik
2025-09-16 13:58 ` Mateusz Guzik [this message]
2025-09-16 13:58 ` [PATCH v4 05/12] netfs: use the new " Mateusz Guzik
2025-09-16 13:58 ` [PATCH v4 06/12] nilfs2: " Mateusz Guzik
2025-09-16 13:58 ` [PATCH v4 07/12] xfs: " Mateusz Guzik
2025-09-16 13:58 ` [PATCH v4 08/12] ext4: " Mateusz Guzik
2025-09-16 13:58 ` [PATCH v4 09/12] f2fs: " Mateusz Guzik
2025-09-16 13:58 ` [PATCH v4 10/12] ceph: " Mateusz Guzik
2025-09-16 17:36 ` Viacheslav Dubeyko
2025-09-16 17:38 ` Mateusz Guzik
2025-09-16 13:58 ` [PATCH v4 11/12] overlayfs: " Mateusz Guzik
2025-09-16 13:59 ` [PATCH v4 12/12] fs: make plain ->i_state access fail to compile Mateusz Guzik
2025-09-19 12:19 ` [PATCH v4 00/12] hide ->i_state behind accessors Christian Brauner
2025-09-19 13:09 ` Mateusz Guzik
2025-09-19 13:39 ` Mateusz Guzik
2025-09-19 15:51 ` Mateusz Guzik
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250916135900.2170346-5-mjguzik@gmail.com \
--to=mjguzik@gmail.com \
--cc=amir73il@gmail.com \
--cc=brauner@kernel.org \
--cc=ceph-devel@vger.kernel.org \
--cc=jack@suse.cz \
--cc=josef@toxicpanda.com \
--cc=kernel-team@fb.com \
--cc=linux-btrfs@vger.kernel.org \
--cc=linux-ext4@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-unionfs@vger.kernel.org \
--cc=linux-xfs@vger.kernel.org \
--cc=viro@zeniv.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).