diff options
author | Jaegeuk Kim <jaegeuk@kernel.org> | 2014-10-14 13:29:50 -0400 |
---|---|---|
committer | Jaegeuk Kim <jaegeuk@kernel.org> | 2014-11-03 19:07:33 -0500 |
commit | e7a2bf2283d368ada40ae52152b7ab2304a76d95 (patch) | |
tree | 564829c692a866a6902a5a5f39a7f92da2184891 /fs/f2fs | |
parent | 3289c061c5aaf914c6eb7bdfadb58a7fdd611d30 (diff) |
f2fs: fix counting inline_data inode numbers
This patch fixes wrongly counting inline_data inode numbers.
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Diffstat (limited to 'fs/f2fs')
-rw-r--r-- | fs/f2fs/inode.c | 4 | ||||
-rw-r--r-- | fs/f2fs/namei.c | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/fs/f2fs/inode.c b/fs/f2fs/inode.c index b9b1d6b147e8..4131e3cfd1cf 100644 --- a/fs/f2fs/inode.c +++ b/fs/f2fs/inode.c | |||
@@ -169,6 +169,7 @@ make_now: | |||
169 | goto bad_inode; | 169 | goto bad_inode; |
170 | } | 170 | } |
171 | unlock_new_inode(inode); | 171 | unlock_new_inode(inode); |
172 | stat_inc_inline_inode(inode); | ||
172 | stat_inc_inline_dir(inode); | 173 | stat_inc_inline_dir(inode); |
173 | trace_f2fs_iget(inode); | 174 | trace_f2fs_iget(inode); |
174 | return inode; | 175 | return inode; |
@@ -296,12 +297,12 @@ void f2fs_evict_inode(struct inode *inode) | |||
296 | 297 | ||
297 | f2fs_lock_op(sbi); | 298 | f2fs_lock_op(sbi); |
298 | remove_inode_page(inode); | 299 | remove_inode_page(inode); |
299 | stat_dec_inline_inode(inode); | ||
300 | f2fs_unlock_op(sbi); | 300 | f2fs_unlock_op(sbi); |
301 | 301 | ||
302 | sb_end_intwrite(inode->i_sb); | 302 | sb_end_intwrite(inode->i_sb); |
303 | no_delete: | 303 | no_delete: |
304 | stat_dec_inline_dir(inode); | 304 | stat_dec_inline_dir(inode); |
305 | stat_dec_inline_inode(inode); | ||
305 | invalidate_mapping_pages(NODE_MAPPING(sbi), inode->i_ino, inode->i_ino); | 306 | invalidate_mapping_pages(NODE_MAPPING(sbi), inode->i_ino, inode->i_ino); |
306 | if (xnid) | 307 | if (xnid) |
307 | invalidate_mapping_pages(NODE_MAPPING(sbi), xnid, xnid); | 308 | invalidate_mapping_pages(NODE_MAPPING(sbi), xnid, xnid); |
@@ -327,7 +328,6 @@ void handle_failed_inode(struct inode *inode) | |||
327 | f2fs_truncate(inode); | 328 | f2fs_truncate(inode); |
328 | 329 | ||
329 | remove_inode_page(inode); | 330 | remove_inode_page(inode); |
330 | stat_dec_inline_inode(inode); | ||
331 | 331 | ||
332 | clear_inode_flag(F2FS_I(inode), FI_INLINE_DENTRY); | 332 | clear_inode_flag(F2FS_I(inode), FI_INLINE_DENTRY); |
333 | alloc_nid_failed(sbi, inode->i_ino); | 333 | alloc_nid_failed(sbi, inode->i_ino); |
diff --git a/fs/f2fs/namei.c b/fs/f2fs/namei.c index 94ba2912ee05..a004a978096f 100644 --- a/fs/f2fs/namei.c +++ b/fs/f2fs/namei.c | |||
@@ -198,8 +198,6 @@ static struct dentry *f2fs_lookup(struct inode *dir, struct dentry *dentry, | |||
198 | inode = f2fs_iget(dir->i_sb, ino); | 198 | inode = f2fs_iget(dir->i_sb, ino); |
199 | if (IS_ERR(inode)) | 199 | if (IS_ERR(inode)) |
200 | return ERR_CAST(inode); | 200 | return ERR_CAST(inode); |
201 | |||
202 | stat_inc_inline_inode(inode); | ||
203 | } | 201 | } |
204 | 202 | ||
205 | return d_splice_alias(inode, dentry); | 203 | return d_splice_alias(inode, dentry); |