diff options
| author | Jaegeuk Kim <jaegeuk@kernel.org> | 2014-10-14 02:34:26 (GMT) |
|---|---|---|
| committer | Jaegeuk Kim <jaegeuk@kernel.org> | 2014-11-04 00:07:33 (GMT) |
| commit | 59a0615540812297e4ff9673de5c1269413d0c40 (patch) | |
| tree | 9b1796b36c6350fbb8d3902ac0bac212b4113126 | |
| parent | 4e6ebf6d493591403237400e94e6fc17b7cb1c62 (diff) | |
| download | linux-59a0615540812297e4ff9673de5c1269413d0c40.tar.xz | |
f2fs: fix to wait correct block type
The inode page needs to wait NODE block io.
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
| -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 0b97b19..35cb1b3 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) void f2fs_set_link(struct inode *dir, struct f2fs_dir_entry *de, struct page *page, struct inode *inode) { + enum page_type type = f2fs_has_inline_dentry(dir) ? NODE : DATA; lock_page(page); - f2fs_wait_on_page_writeback(page, DATA); + f2fs_wait_on_page_writeback(page, type); de->ino = cpu_to_le32(inode->i_ino); set_de_type(de, inode); if (!f2fs_has_inline_dentry(dir)) diff --git a/fs/f2fs/inline.c b/fs/f2fs/inline.c index 4cdce00..175f38a 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, goto out; } - f2fs_wait_on_page_writeback(ipage, DATA); + f2fs_wait_on_page_writeback(ipage, NODE); down_write(&F2FS_I(inode)->i_sem); page = init_inode_metadata(inode, dir, name); @@ -472,7 +472,7 @@ void f2fs_delete_inline_entry(struct f2fs_dir_entry *dentry, struct page *page, int i; lock_page(page); - f2fs_wait_on_page_writeback(page, DATA); + f2fs_wait_on_page_writeback(page, NODE); inline_dentry = inline_data_addr(page); bit_pos = dentry - inline_dentry->dentry; |