nilfs2: 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/nilfs2/cpfile.c b/fs/nilfs2/cpfile.c
index bcc7d76269ac90f5b1618b696b8f4d00d983bfe3..4bbdc832d7f2f9c70e5db5c0cc3778c1e1914655 100644 (file)
--- a/fs/nilfs2/cpfile.c
+++ b/fs/nilfs2/cpfile.c
@@ -1148,7 +1148,7 @@ int nilfs_cpfile_read(struct super_block *sb, size_t cpsize,
        cpfile = nilfs_iget_locked(sb, NULL, NILFS_CPFILE_INO);
        if (unlikely(!cpfile))
                return -ENOMEM;
-       if (!(cpfile->i_state & I_NEW))
+       if (!(inode_state_read_once(cpfile) & I_NEW))
                goto out;
 
        err = nilfs_mdt_init(cpfile, NILFS_MDT_GFP, 0);

diff --git a/fs/nilfs2/dat.c b/fs/nilfs2/dat.c
index c664daba56ae6c34a1818eb48dca6a99a7c77672..674380837ab98bac4e630df3a70e1aa692c91ece 100644 (file)
--- a/fs/nilfs2/dat.c
+++ b/fs/nilfs2/dat.c
@@ -506,7 +506,7 @@ int nilfs_dat_read(struct super_block *sb, size_t entry_size,
        dat = nilfs_iget_locked(sb, NULL, NILFS_DAT_INO);
        if (unlikely(!dat))
                return -ENOMEM;
-       if (!(dat->i_state & I_NEW))
+       if (!(inode_state_read_once(dat) & I_NEW))
                goto out;
 
        err = nilfs_mdt_init(dat, NILFS_MDT_GFP, sizeof(*di));

diff --git a/fs/nilfs2/ifile.c b/fs/nilfs2/ifile.c
index c4cd4a4dedd0f4b7566ace814f27d6a2852350cb..99eb8a59009eb2698f3e669554e1285d58f842a9 100644 (file)
--- a/fs/nilfs2/ifile.c
+++ b/fs/nilfs2/ifile.c
@@ -188,7 +188,7 @@ int nilfs_ifile_read(struct super_block *sb, struct nilfs_root *root,
        ifile = nilfs_iget_locked(sb, root, NILFS_IFILE_INO);
        if (unlikely(!ifile))
                return -ENOMEM;
-       if (!(ifile->i_state & I_NEW))
+       if (!(inode_state_read_once(ifile) & I_NEW))
                goto out;
 
        err = nilfs_mdt_init(ifile, NILFS_MDT_GFP,

diff --git a/fs/nilfs2/inode.c b/fs/nilfs2/inode.c
index 87ddde159f0c930d7f78b1f92d5a2a23e49dfa02..51bde45d586509dda3ef0cb7c46facb7fb2c61dd 100644 (file)
--- a/fs/nilfs2/inode.c
+++ b/fs/nilfs2/inode.c
@@ -365,7 +365,7 @@ struct inode *nilfs_new_inode(struct inode *dir, umode_t mode)
 
  failed_after_creation:
        clear_nlink(inode);
-       if (inode->i_state & I_NEW)
+       if (inode_state_read_once(inode) & I_NEW)
                unlock_new_inode(inode);
        iput(inode);  /*
                       * raw_inode will be deleted through
@@ -562,7 +562,7 @@ struct inode *nilfs_iget(struct super_block *sb, struct nilfs_root *root,
        if (unlikely(!inode))
                return ERR_PTR(-ENOMEM);
 
-       if (!(inode->i_state & I_NEW)) {
+       if (!(inode_state_read_once(inode) & I_NEW)) {
                if (!inode->i_nlink) {
                        iput(inode);
                        return ERR_PTR(-ESTALE);
@@ -591,7 +591,7 @@ struct inode *nilfs_iget_for_gc(struct super_block *sb, unsigned long ino,
        inode = iget5_locked(sb, ino, nilfs_iget_test, nilfs_iget_set, &args);
        if (unlikely(!inode))
                return ERR_PTR(-ENOMEM);
-       if (!(inode->i_state & I_NEW))
+       if (!(inode_state_read_once(inode) & I_NEW))
                return inode;
 
        err = nilfs_init_gcinode(inode);
@@ -631,7 +631,7 @@ int nilfs_attach_btree_node_cache(struct inode *inode)
                                  nilfs_iget_set, &args);
        if (unlikely(!btnc_inode))
                return -ENOMEM;
-       if (btnc_inode->i_state & I_NEW) {
+       if (inode_state_read_once(btnc_inode) & I_NEW) {
                nilfs_init_btnc_inode(btnc_inode);
                unlock_new_inode(btnc_inode);
        }
@@ -686,7 +686,7 @@ struct inode *nilfs_iget_for_shadow(struct inode *inode)
                               nilfs_iget_set, &args);
        if (unlikely(!s_inode))
                return ERR_PTR(-ENOMEM);
-       if (!(s_inode->i_state & I_NEW))
+       if (!(inode_state_read_once(s_inode) & I_NEW))
                return inode;
 
        NILFS_I(s_inode)->i_flags = 0;

diff --git a/fs/nilfs2/sufile.c b/fs/nilfs2/sufile.c
index 330f269abedf5d913448c31c14b6412af4c7511d..83f93337c01b24cea78d5dab037ca6a2a72dce0f 100644 (file)
--- a/fs/nilfs2/sufile.c
+++ b/fs/nilfs2/sufile.c
@@ -1226,7 +1226,7 @@ int nilfs_sufile_read(struct super_block *sb, size_t susize,
        sufile = nilfs_iget_locked(sb, NULL, NILFS_SUFILE_INO);
        if (unlikely(!sufile))
                return -ENOMEM;
-       if (!(sufile->i_state & I_NEW))
+       if (!(inode_state_read_once(sufile) & I_NEW))
                goto out;
 
        err = nilfs_mdt_init(sufile, NILFS_MDT_GFP, sizeof(*sui));