diff options
author | Jaegeuk Kim <jaegeuk@kernel.org> | 2014-10-13 22:34:26 -0400 |
---|---|---|
committer | Jaegeuk Kim <jaegeuk@kernel.org> | 2014-11-03 19:07:33 -0500 |
commit | 59a0615540812297e4ff9673de5c1269413d0c40 (patch) | |
tree | 9b1796b36c6350fbb8d3902ac0bac212b4113126 /fs/f2fs | |
parent | 4e6ebf6d493591403237400e94e6fc17b7cb1c62 (diff) |
f2fs: fix to wait correct block type
The inode page needs to wait NODE block io.
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Diffstat (limited to 'fs/f2fs')
-rw-r--r-- | fs/f2fs/dir.c | 3 | ||||
-rw-r--r-- | fs/f2fs/inline.c | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/fs/f2fs/dir.c b/fs/f2fs/dir.c index 0b97b1921504..35cb1b3d94b9 100644 --- a/fs/f2fs/dir.c +++ b/fs/f2fs/dir.c | |||
@@ -283,8 +283,9 @@ ino_t f2fs_inode_by_name(struct inode *dir, struct qstr *qstr) | |||
283 | void f2fs_set_link(struct inode *dir, struct f2fs_dir_entry *de, | 283 | void f2fs_set_link(struct inode *dir, struct f2fs_dir_entry *de, |
284 | struct page *page, struct inode *inode) | 284 | struct page *page, struct inode *inode) |
285 | { | 285 | { |
286 | enum page_type type = f2fs_has_inline_dentry(dir) ? NODE : DATA; | ||
286 | lock_page(page); | 287 | lock_page(page); |
287 | f2fs_wait_on_page_writeback(page, DATA); | 288 | f2fs_wait_on_page_writeback(page, type); |
288 | de->ino = cpu_to_le32(inode->i_ino); | 289 | de->ino = cpu_to_le32(inode->i_ino); |
289 | set_de_type(de, inode); | 290 | set_de_type(de, inode); |
290 | if (!f2fs_has_inline_dentry(dir)) | 291 | if (!f2fs_has_inline_dentry(dir)) |
diff --git a/fs/f2fs/inline.c b/fs/f2fs/inline.c index 4cdce00ed537..175f38a96700 100644 --- a/fs/f2fs/inline.c +++ b/fs/f2fs/inline.c | |||
@@ -427,7 +427,7 @@ int f2fs_add_inline_entry(struct inode *dir, const struct qstr *name, | |||
427 | goto out; | 427 | goto out; |
428 | } | 428 | } |
429 | 429 | ||
430 | f2fs_wait_on_page_writeback(ipage, DATA); | 430 | f2fs_wait_on_page_writeback(ipage, NODE); |
431 | 431 | ||
432 | down_write(&F2FS_I(inode)->i_sem); | 432 | down_write(&F2FS_I(inode)->i_sem); |
433 | page = init_inode_metadata(inode, dir, name); | 433 | page = init_inode_metadata(inode, dir, name); |
@@ -472,7 +472,7 @@ void f2fs_delete_inline_entry(struct f2fs_dir_entry *dentry, struct page *page, | |||
472 | int i; | 472 | int i; |
473 | 473 | ||
474 | lock_page(page); | 474 | lock_page(page); |
475 | f2fs_wait_on_page_writeback(page, DATA); | 475 | f2fs_wait_on_page_writeback(page, NODE); |
476 | 476 | ||
477 | inline_dentry = inline_data_addr(page); | 477 | inline_dentry = inline_data_addr(page); |
478 | bit_pos = dentry - inline_dentry->dentry; | 478 | bit_pos = dentry - inline_dentry->dentry; |