Commit abdb318b authored by Jiro SEKIBA's avatar Jiro SEKIBA Committed by Ryusuke Konishi
Browse files

nilfs2: replace mark_inode_dirty as nilfs_mark_inode_dirty 



Replace mark_inode_dirty() as nilfs_mark_inode_dirty()
to reduce deep function calls.

Signed-off-by: default avatarJiro SEKIBA <jir@unicus.jp>
Signed-off-by: default avatarRyusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>
parent 3534573b

fs/nilfs2/dir.c

+1 −1
Original line number Diff line number Diff line
@@ -548,7 +548,7 @@ int nilfs_add_link(struct dentry *dentry, struct inode *inode) 
	nilfs_commit_chunk(page, page->mapping, from, to);

	dir->i_mtime = dir->i_ctime = CURRENT_TIME;

/*	NILFS_I(dir)->i_flags &= ~NILFS_BTREE_FL; */

	mark_inode_dirty(dir);

	nilfs_mark_inode_dirty(dir);

	/* OFFSET_CACHE */

out_put:

	nilfs_put_page(page);

fs/nilfs2/inode.c

+3 −3
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ int nilfs_get_block(struct inode *inode, sector_t blkoff, 
			nilfs_transaction_abort(inode->i_sb);

			goto out;

		}

		mark_inode_dirty(inode);

		nilfs_mark_inode_dirty(inode);

		nilfs_transaction_commit(inode->i_sb); /* never fails */

		/* Error handling should be detailed */

		set_buffer_new(bh_result);
@@ -598,7 +598,7 @@ void nilfs_truncate(struct inode *inode) 
	if (IS_SYNC(inode))

		nilfs_set_transaction_flag(NILFS_TI_SYNC);



	mark_inode_dirty(inode);

	nilfs_mark_inode_dirty(inode);

	nilfs_set_file_dirty(NILFS_SB(sb), inode, 0);

	nilfs_transaction_commit(sb);

	/* May construct a logical segment and may fail in sync mode.
@@ -623,7 +623,7 @@ void nilfs_delete_inode(struct inode *inode) 
		truncate_inode_pages(&inode->i_data, 0);



	nilfs_truncate_bmap(ii, 0);

	mark_inode_dirty(inode);

	nilfs_mark_inode_dirty(inode);

	nilfs_free_inode(inode);

	/* nilfs_free_inode() marks inode buffer dirty */

	if (IS_SYNC(inode))

fs/nilfs2/namei.c

+16 −16
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ static int nilfs_create(struct inode *dir, struct dentry *dentry, int mode, 
		inode->i_op = &nilfs_file_inode_operations;

		inode->i_fop = &nilfs_file_operations;

		inode->i_mapping->a_ops = &nilfs_aops;

		mark_inode_dirty(inode);

		nilfs_mark_inode_dirty(inode);

		err = nilfs_add_nondir(dentry, inode);

	}

	if (!err)
@@ -148,7 +148,7 @@ nilfs_mknod(struct inode *dir, struct dentry *dentry, int mode, dev_t rdev) 
	err = PTR_ERR(inode);

	if (!IS_ERR(inode)) {

		init_special_inode(inode, inode->i_mode, rdev);

		mark_inode_dirty(inode);

		nilfs_mark_inode_dirty(inode);

		err = nilfs_add_nondir(dentry, inode);

	}

	if (!err)
@@ -201,7 +201,7 @@ static int nilfs_symlink(struct inode *dir, struct dentry *dentry, 


out_fail:

	drop_nlink(inode);

	mark_inode_dirty(inode);

	nilfs_mark_inode_dirty(inode);

	iput(inode);

	goto out;

}
@@ -267,7 +267,7 @@ static int nilfs_mkdir(struct inode *dir, struct dentry *dentry, int mode) 
	if (err)

		goto out_fail;



	mark_inode_dirty(inode);

	nilfs_mark_inode_dirty(inode);

	d_instantiate(dentry, inode);

out:

	if (!err)
@@ -280,11 +280,11 @@ static int nilfs_mkdir(struct inode *dir, struct dentry *dentry, int mode) 
out_fail:

	drop_nlink(inode);

	drop_nlink(inode);

	mark_inode_dirty(inode);

	nilfs_mark_inode_dirty(inode);

	iput(inode);

out_dir:

	drop_nlink(dir);

	mark_inode_dirty(dir);

	nilfs_mark_inode_dirty(dir);

	goto out;

}
@@ -334,8 +334,8 @@ static int nilfs_unlink(struct inode *dir, struct dentry *dentry) 
	err = nilfs_do_unlink(dir, dentry);



	if (!err) {

		mark_inode_dirty(dir);

		mark_inode_dirty(dentry->d_inode);

		nilfs_mark_inode_dirty(dir);

		nilfs_mark_inode_dirty(dentry->d_inode);

		err = nilfs_transaction_commit(dir->i_sb);

	} else

		nilfs_transaction_abort(dir->i_sb);
@@ -359,9 +359,9 @@ static int nilfs_rmdir(struct inode *dir, struct dentry *dentry) 
		if (!err) {

			inode->i_size = 0;

			drop_nlink(inode);

			mark_inode_dirty(inode);

			nilfs_mark_inode_dirty(inode);

			drop_nlink(dir);

			mark_inode_dirty(dir);

			nilfs_mark_inode_dirty(dir);

		}

	}

	if (!err)
@@ -414,12 +414,12 @@ static int nilfs_rename(struct inode *old_dir, struct dentry *old_dentry, 
			goto out_dir;

		inc_nlink(old_inode);

		nilfs_set_link(new_dir, new_de, new_page, old_inode);

		mark_inode_dirty(new_dir);

		nilfs_mark_inode_dirty(new_dir);

		new_inode->i_ctime = CURRENT_TIME;

		if (dir_de)

			drop_nlink(new_inode);

		drop_nlink(new_inode);

		mark_inode_dirty(new_inode);

		nilfs_mark_inode_dirty(new_inode);

	} else {

		if (dir_de) {

			err = -EMLINK;
@@ -430,12 +430,12 @@ static int nilfs_rename(struct inode *old_dir, struct dentry *old_dentry, 
		err = nilfs_add_link(new_dentry, old_inode);

		if (err) {

			drop_nlink(old_inode);

			mark_inode_dirty(old_inode);

			nilfs_mark_inode_dirty(old_inode);

			goto out_dir;

		}

		if (dir_de) {

			inc_nlink(new_dir);

			mark_inode_dirty(new_dir);

			nilfs_mark_inode_dirty(new_dir);

		}

	}
@@ -452,8 +452,8 @@ static int nilfs_rename(struct inode *old_dir, struct dentry *old_dentry, 
		nilfs_set_link(old_inode, dir_de, dir_page, new_dir);

		drop_nlink(old_dir);

	}

	mark_inode_dirty(old_dir);

	mark_inode_dirty(old_inode);

	nilfs_mark_inode_dirty(old_dir);

	nilfs_mark_inode_dirty(old_inode);



	err = nilfs_transaction_commit(old_dir->i_sb);

	return err;