summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiro SEKIBA <jir@unicus.jp>2009-11-27 13:41:12 +0300
committerRyusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>2009-11-27 14:05:16 +0300
commit58d55471cb1911f7493aba7bf3b6b87ca91e4314 (patch)
treea66a97fb1f5b1bec314a471de9deaae7dd110f55
parent2093abf9cbcec3cb1409a67d8bce51854595b1d5 (diff)
downloadlinux-58d55471cb1911f7493aba7bf3b6b87ca91e4314.tar.xz
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>
-rw-r--r--fs/nilfs2/dir.c4
-rw-r--r--fs/nilfs2/namei.c2
2 files changed, 2 insertions, 4 deletions
diff --git a/fs/nilfs2/dir.c b/fs/nilfs2/dir.c
index 173530d14866..693539b2c8a3 100644
--- 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 d92e83905f01..d6aa8f4c804b 100644
--- 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)