Skip to content

Commit a18d430

Browse files
mjguzikbrauner
authored andcommitted
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>
1 parent ff175a4 commit a18d430

5 files changed

Lines changed: 9 additions & 9 deletions

File tree

fs/nilfs2/cpfile.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1148,7 +1148,7 @@ int nilfs_cpfile_read(struct super_block *sb, size_t cpsize,
11481148
cpfile = nilfs_iget_locked(sb, NULL, NILFS_CPFILE_INO);
11491149
if (unlikely(!cpfile))
11501150
return -ENOMEM;
1151-
if (!(cpfile->i_state & I_NEW))
1151+
if (!(inode_state_read_once(cpfile) & I_NEW))
11521152
goto out;
11531153

11541154
err = nilfs_mdt_init(cpfile, NILFS_MDT_GFP, 0);

fs/nilfs2/dat.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -506,7 +506,7 @@ int nilfs_dat_read(struct super_block *sb, size_t entry_size,
506506
dat = nilfs_iget_locked(sb, NULL, NILFS_DAT_INO);
507507
if (unlikely(!dat))
508508
return -ENOMEM;
509-
if (!(dat->i_state & I_NEW))
509+
if (!(inode_state_read_once(dat) & I_NEW))
510510
goto out;
511511

512512
err = nilfs_mdt_init(dat, NILFS_MDT_GFP, sizeof(*di));

fs/nilfs2/ifile.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ int nilfs_ifile_read(struct super_block *sb, struct nilfs_root *root,
188188
ifile = nilfs_iget_locked(sb, root, NILFS_IFILE_INO);
189189
if (unlikely(!ifile))
190190
return -ENOMEM;
191-
if (!(ifile->i_state & I_NEW))
191+
if (!(inode_state_read_once(ifile) & I_NEW))
192192
goto out;
193193

194194
err = nilfs_mdt_init(ifile, NILFS_MDT_GFP,

fs/nilfs2/inode.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -365,7 +365,7 @@ struct inode *nilfs_new_inode(struct inode *dir, umode_t mode)
365365

366366
failed_after_creation:
367367
clear_nlink(inode);
368-
if (inode->i_state & I_NEW)
368+
if (inode_state_read_once(inode) & I_NEW)
369369
unlock_new_inode(inode);
370370
iput(inode); /*
371371
* raw_inode will be deleted through
@@ -562,7 +562,7 @@ struct inode *nilfs_iget(struct super_block *sb, struct nilfs_root *root,
562562
if (unlikely(!inode))
563563
return ERR_PTR(-ENOMEM);
564564

565-
if (!(inode->i_state & I_NEW)) {
565+
if (!(inode_state_read_once(inode) & I_NEW)) {
566566
if (!inode->i_nlink) {
567567
iput(inode);
568568
return ERR_PTR(-ESTALE);
@@ -591,7 +591,7 @@ struct inode *nilfs_iget_for_gc(struct super_block *sb, unsigned long ino,
591591
inode = iget5_locked(sb, ino, nilfs_iget_test, nilfs_iget_set, &args);
592592
if (unlikely(!inode))
593593
return ERR_PTR(-ENOMEM);
594-
if (!(inode->i_state & I_NEW))
594+
if (!(inode_state_read_once(inode) & I_NEW))
595595
return inode;
596596

597597
err = nilfs_init_gcinode(inode);
@@ -631,7 +631,7 @@ int nilfs_attach_btree_node_cache(struct inode *inode)
631631
nilfs_iget_set, &args);
632632
if (unlikely(!btnc_inode))
633633
return -ENOMEM;
634-
if (btnc_inode->i_state & I_NEW) {
634+
if (inode_state_read_once(btnc_inode) & I_NEW) {
635635
nilfs_init_btnc_inode(btnc_inode);
636636
unlock_new_inode(btnc_inode);
637637
}
@@ -686,7 +686,7 @@ struct inode *nilfs_iget_for_shadow(struct inode *inode)
686686
nilfs_iget_set, &args);
687687
if (unlikely(!s_inode))
688688
return ERR_PTR(-ENOMEM);
689-
if (!(s_inode->i_state & I_NEW))
689+
if (!(inode_state_read_once(s_inode) & I_NEW))
690690
return inode;
691691

692692
NILFS_I(s_inode)->i_flags = 0;

fs/nilfs2/sufile.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1226,7 +1226,7 @@ int nilfs_sufile_read(struct super_block *sb, size_t susize,
12261226
sufile = nilfs_iget_locked(sb, NULL, NILFS_SUFILE_INO);
12271227
if (unlikely(!sufile))
12281228
return -ENOMEM;
1229-
if (!(sufile->i_state & I_NEW))
1229+
if (!(inode_state_read_once(sufile) & I_NEW))
12301230
goto out;
12311231

12321232
err = nilfs_mdt_init(sufile, NILFS_MDT_GFP, sizeof(*sui));

0 commit comments

Comments
 (0)