On Fri, 27 Nov 2009 16:02:03 +0900, Jiro SEKIBA <[email protected]> wrote:
> Delete mark_inode_dirty() in nilfs_delete_entry() to reduce duplicate
> mark_inode_dirty() calls both in nilfs_rename() and nilfs_delete_entry().
>
> Signed-off-by: Jiro SEKIBA <[email protected]>
> ---
> fs/nilfs2/dir.c | 1 -
> fs/nilfs2/namei.c | 4 +++-
> 2 files changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/fs/nilfs2/dir.c b/fs/nilfs2/dir.c
> index 693539b..1d9a4e4 100644
> --- a/fs/nilfs2/dir.c
> +++ b/fs/nilfs2/dir.c
> @@ -595,7 +595,6 @@ int nilfs_delete_entry(struct nilfs_dir_entry *dir,
> struct page *page)
> nilfs_commit_chunk(page, mapping, from, to);
> inode->i_ctime = inode->i_mtime = CURRENT_TIME;
> /* NILFS_I(inode)->i_flags &= ~NILFS_BTREE_FL; */
> - mark_inode_dirty(inode);
> out:
> nilfs_put_page(page);
> return err;
> diff --git a/fs/nilfs2/namei.c b/fs/nilfs2/namei.c
> index c662f8e..166a261 100644
> --- a/fs/nilfs2/namei.c
> +++ b/fs/nilfs2/namei.c
> @@ -316,6 +316,8 @@ static int nilfs_do_unlink(struct inode *dir, struct
> dentry *dentry)
> if (err)
> goto out;
>
> + mark_inode_dirty(dir);
> +
I think this mark_inode_dirty(dir) should be moved to nilfs_unlink()
because nilfs_rmdir() already has one mark_inode_dirty(dir) call.
> inode->i_ctime = dir->i_ctime;
> drop_nlink(inode);
> err = 0;
> @@ -451,8 +453,8 @@ static int nilfs_rename(struct inode *old_dir, struct
> dentry *old_dentry,
> if (dir_de) {
> nilfs_set_link(old_inode, dir_de, dir_page, new_dir);
> drop_nlink(old_dir);
> - mark_inode_dirty(old_dir);
> }
> + mark_inode_dirty(old_dir);
> mark_inode_dirty(old_inode);
>
> err = nilfs_transaction_commit(old_dir->i_sb);
> --
> 1.5.6.5
>
> _______________________________________________
> users mailing list
> [email protected]
> https://www.nilfs.org/mailman/listinfo/users
_______________________________________________
users mailing list
[email protected]
https://www.nilfs.org/mailman/listinfo/users
