f2fs: use the new ->i_state accessors

Change generated with coccinelle and fixed up by hand as appropriate.

Signed-off-by: Mateusz Guzik <mjguzik@gmail.com>
Signed-off-by: Christian Brauner <brauner@kernel.org>

diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index ef38e62cda8fe6ddf784b16e0a725bf4dc075f52..c5319864e4ff5387bc461649618ffd81108bafc8 100644 (file)
--- 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 8c4eafe9ffac045d24060233bffbd02b3efe97f4..f1cda190065881b5cbe7849286f74f7b2e20d795 100644 (file)
--- 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 b882771e469971dcf4e7a42416f9fbb8a5d9bf39..af40282a6948e5b7b9001ca5964993064417fd0a 100644 (file)
--- 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 fd8e7b0b216621532ad0fb0d8cad85432cfd7530..8806a1f221cf4ae0f63c9bc24c55777b1c5d07e9 100644 (file)
--- 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);