diff options
author | Jiro SEKIBA <jir@unicus.jp> | 2009-11-27 05:41:12 -0500 |
---|---|---|
committer | Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp> | 2009-11-27 06:05:16 -0500 |
commit | 58d55471cb1911f7493aba7bf3b6b87ca91e4314 (patch) | |
tree | a66a97fb1f5b1bec314a471de9deaae7dd110f55 | |
parent | 2093abf9cbcec3cb1409a67d8bce51854595b1d5 (diff) |
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.c | 4 | ||||
-rw-r--r-- | fs/nilfs2/namei.c | 2 |
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, | |||
112 | 112 | ||
113 | nr_dirty = nilfs_page_count_clean_buffers(page, from, to); | 113 | nr_dirty = nilfs_page_count_clean_buffers(page, from, to); |
114 | copied = block_write_end(NULL, mapping, pos, len, len, page, NULL); | 114 | copied = block_write_end(NULL, mapping, pos, len, len, page, NULL); |
115 | if (pos + copied > dir->i_size) { | 115 | if (pos + copied > dir->i_size) |
116 | i_size_write(dir, pos + copied); | 116 | i_size_write(dir, pos + copied); |
117 | mark_inode_dirty(dir); | ||
118 | } | ||
119 | if (IS_DIRSYNC(dir)) | 117 | if (IS_DIRSYNC(dir)) |
120 | nilfs_set_transaction_flag(NILFS_TI_SYNC); | 118 | nilfs_set_transaction_flag(NILFS_TI_SYNC); |
121 | err = nilfs_set_file_dirty(sbi, dir, nr_dirty); | 119 | 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) | |||
258 | inode->i_mapping->a_ops = &nilfs_aops; | 258 | inode->i_mapping->a_ops = &nilfs_aops; |
259 | 259 | ||
260 | inc_nlink(inode); | 260 | inc_nlink(inode); |
261 | mark_inode_dirty(inode); | ||
262 | 261 | ||
263 | err = nilfs_make_empty(inode, dir); | 262 | err = nilfs_make_empty(inode, dir); |
264 | if (err) | 263 | if (err) |
@@ -268,6 +267,7 @@ static int nilfs_mkdir(struct inode *dir, struct dentry *dentry, int mode) | |||
268 | if (err) | 267 | if (err) |
269 | goto out_fail; | 268 | goto out_fail; |
270 | 269 | ||
270 | mark_inode_dirty(inode); | ||
271 | d_instantiate(dentry, inode); | 271 | d_instantiate(dentry, inode); |
272 | out: | 272 | out: |
273 | if (!err) | 273 | if (!err) |