Re: [PATCH v7 06/14] btrfs: use the new ->i_state accessors

Jan Kara
2025-10-10T14:11:38Z

On Thu 09-10-25 09:59:20, Mateusz Guzik wrote:
> Change generated with coccinelle and fixed up by hand as appropriate.
>
> Signed-off-by: Mateusz Guzik <mjguzik@gmail.com>

Looks good. Feel free to add:

Reviewed-by: Jan Kara <jack@suse.cz>

Honza

> ---
>
> cheat sheet:
>
> If ->i_lock is held, then:
>
> state = inode->i_state => state = inode_state_read(inode)
> inode->i_state |= (I_A | I_B) => inode_state_set(inode, I_A | I_B)
> inode->i_state &= ~(I_A | I_B) => inode_state_clear(inode, I_A | I_B)
> inode->i_state = I_A | I_B => inode_state_assign(inode, I_A | I_B)
>
> If ->i_lock is not held or only held conditionally:
>
> state = inode->i_state => state = inode_state_read_once(inode)
> inode->i_state |= (I_A | I_B) => inode_state_set_raw(inode, I_A | I_B)
> inode->i_state &= ~(I_A | I_B) => inode_state_clear_raw(inode, I_A | I_B)
> inode->i_state = I_A | I_B => inode_state_assign_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 3b1b3a0553ee..433ffe231546 100644
> --- a/fs/btrfs/inode.c
> +++ b/fs/btrfs/inode.c
> @@ -3884,7 +3884,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;
> @@ -5361,7 +5361,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);
> @@ -5799,7 +5799,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);
> @@ -5823,7 +5823,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();
> @@ -7480,7 +7480,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.34.1
>
--
Jan Kara <jack@suse.com>
SUSE Labs, CR