Unverified Commit a18d4304 authored by Mateusz Guzik's avatar Mateusz Guzik Committed by Christian Brauner
Browse files

nilfs2: use the new ->i_state accessors 



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

Signed-off-by: default avatarMateusz Guzik <mjguzik@gmail.com>
Signed-off-by: default avatarChristian Brauner <brauner@kernel.org>
parent ff175a4f

fs/nilfs2/cpfile.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

fs/nilfs2/dat.c

+1 −1
Original line number Diff line number Diff line
@@ -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));

fs/nilfs2/ifile.c

+1 −1
Original line number Diff line number Diff line
@@ -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,

fs/nilfs2/inode.c

+5 −5
Original line number Diff line number Diff line
@@ -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;

fs/nilfs2/sufile.c

+1 −1
Original line number Diff line number Diff line
@@ -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));