Re: [PATCH v7 09/14] f2fs: use the new ->i_state accessors

Jan Kara
2025-10-10T14:16:45Z

On Thu 09-10-25 09:59:23, 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/f2fs/data.c | 2 +-
> fs/f2fs/inode.c | 2 +-
> fs/f2fs/namei.c | 4 ++--
> fs/f2fs/super.c | 2 +-
> 4 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
> index ef38e62cda8f..c5319864e4ff 100644
> --- a/fs/f2fs/data.c
> +++ b/fs/f2fs/data.c
> @@ -4222,7 +4222,7 @@ static int f2fs_iomap_begin(struct inode *inode, loff_t offset, loff_t length,
>
> if (map.m_flags & F2FS_MAP_NEW)
> iomap->flags |= IOMAP_F_NEW;
> - if ((inode->i_state & I_DIRTY_DATASYNC) ||
> + if ((inode_state_read_once(inode) & I_DIRTY_DATASYNC) ||
> offset + length > i_size_read(inode))
> iomap->flags |= IOMAP_F_DIRTY;
>
> diff --git a/fs/f2fs/inode.c b/fs/f2fs/inode.c
> index 8c4eafe9ffac..f1cda1900658 100644
> --- a/fs/f2fs/inode.c
> +++ b/fs/f2fs/inode.c
> @@ -569,7 +569,7 @@ struct inode *f2fs_iget(struct super_block *sb, unsigned long ino)
> if (!inode)
> return ERR_PTR(-ENOMEM);
>
> - if (!(inode->i_state & I_NEW)) {
> + if (!(inode_state_read_once(inode) & I_NEW)) {
> if (is_meta_ino(sbi, ino)) {
> f2fs_err(sbi, "inaccessible inode: %lu, run fsck to repair", ino);
> set_sbi_flag(sbi, SBI_NEED_FSCK);
> diff --git a/fs/f2fs/namei.c b/fs/f2fs/namei.c
> index b882771e4699..af40282a6948 100644
> --- a/fs/f2fs/namei.c
> +++ b/fs/f2fs/namei.c
> @@ -844,7 +844,7 @@ static int __f2fs_tmpfile(struct mnt_idmap *idmap, struct inode *dir,
> f2fs_i_links_write(inode, false);
>
> spin_lock(&inode->i_lock);
> - inode->i_state |= I_LINKABLE;
> + inode_state_set(inode, I_LINKABLE);
> spin_unlock(&inode->i_lock);
> } else {
> if (file)
> @@ -1057,7 +1057,7 @@ static int f2fs_rename(struct mnt_idmap *idmap, struct inode *old_dir,
> goto put_out_dir;
>
> spin_lock(&whiteout->i_lock);
> - whiteout->i_state &= ~I_LINKABLE;
> + inode_state_clear(whiteout, I_LINKABLE);
> spin_unlock(&whiteout->i_lock);
>
> iput(whiteout);
> diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
> index fd8e7b0b2166..8806a1f221cf 100644
> --- a/fs/f2fs/super.c
> +++ b/fs/f2fs/super.c
> @@ -1798,7 +1798,7 @@ static int f2fs_drop_inode(struct inode *inode)
> * - f2fs_gc -> iput -> evict
> * - inode_wait_for_writeback(inode)
> */
> - if ((!inode_unhashed(inode) && inode->i_state & I_SYNC)) {
> + if ((!inode_unhashed(inode) && inode_state_read(inode) & I_SYNC)) {
> if (!inode->i_nlink && !is_bad_inode(inode)) {
> /* to avoid evict_inode call simultaneously */
> __iget(inode);
> --
> 2.34.1
>
--
Jan Kara <jack@suse.com>
SUSE Labs, CR