nilfs2: delete mark_inode_dirty in nilfs_commit_chunk

Delete mark_inode_dirty() in nilfs_commit_chunk(), for callers of
nilfs_commit_chunk() will call equivalent mark_inode_dirty()
after calling nilfs_commit_chunk().

Signed-off-by: Jiro SEKIBA <jir@unicus.jp>
Signed-off-by: Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>

diff --git a/fs/nilfs2/dir.c b/fs/nilfs2/dir.c
index 173530d1486646d484b7bc0cd457abfd8e703676..693539b2c8a39d9dbb4ff439ac902eae16bc0ba2 100644 (file)
--- a/fs/nilfs2/dir.c
+++ b/fs/nilfs2/dir.c
@@ -112,10 +112,8 @@ static void nilfs_commit_chunk(struct page *page,
 
        nr_dirty = nilfs_page_count_clean_buffers(page, from, to);
        copied = block_write_end(NULL, mapping, pos, len, len, page, NULL);
-       if (pos + copied > dir->i_size) {
+       if (pos + copied > dir->i_size)
                i_size_write(dir, pos + copied);
-               mark_inode_dirty(dir);
-       }
        if (IS_DIRSYNC(dir))
                nilfs_set_transaction_flag(NILFS_TI_SYNC);
        err = nilfs_set_file_dirty(sbi, dir, nr_dirty);

diff --git a/fs/nilfs2/namei.c b/fs/nilfs2/namei.c
index d92e83905f0145d2242a2d6bee1981a44cbe094b..d6aa8f4c804b2e2c83de96e13c16527e7e46a1ed 100644 (file)
--- a/fs/nilfs2/namei.c
+++ b/fs/nilfs2/namei.c
@@ -258,7 +258,6 @@ static int nilfs_mkdir(struct inode *dir, struct dentry *dentry, int mode)
        inode->i_mapping->a_ops = &nilfs_aops;
 
        inc_nlink(inode);
-       mark_inode_dirty(inode);
 
        err = nilfs_make_empty(inode, dir);
        if (err)
@@ -268,6 +267,7 @@ static int nilfs_mkdir(struct inode *dir, struct dentry *dentry, int mode)
        if (err)
                goto out_fail;
 
+       mark_inode_dirty(inode);
        d_instantiate(dentry, inode);
 out:
        if (!err)