diff options
| author | Jaegeuk Kim <jaegeuk@kernel.org> | 2014-10-18 07:33:55 +0400 |
|---|---|---|
| committer | Jaegeuk Kim <jaegeuk@kernel.org> | 2014-11-04 03:07:30 +0300 |
| commit | 9ba69cf9877384baebd16c6fb51ceccd13677b37 (patch) | |
| tree | c88d71c4b2e41c1519851c54f52b96c523fa6a4c /fs/f2fs/data.c | |
| parent | a78186ebe516b6d7df43636603f0998803ab356a (diff) | |
| download | linux-9ba69cf9877384baebd16c6fb51ceccd13677b37.tar.xz | |
f2fs: avoid to allocate when inline_data was written
The sceanrio is like this.
inline_data i_size page write_begin/vm_page_mkwrite
X 30 dirty_page
X 30 write to #4096 position
X 30 get_dnode_of_data wait for get_dnode_of_data
O 30 write inline_data
O 30 get_dnode_of_data
O 30 reserve data block
..
In this case, we have #0 = NEW_ADDR and inline_data as well.
We should not allow this condition for further access.
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Diffstat (limited to 'fs/f2fs/data.c')
| -rw-r--r-- | fs/f2fs/data.c | 32 |
1 files changed, 23 insertions, 9 deletions
diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c index 5b80adac8985..973fd7770d56 100644 --- a/fs/f2fs/data.c +++ b/fs/f2fs/data.c @@ -257,9 +257,6 @@ int f2fs_reserve_block(struct dnode_of_data *dn, pgoff_t index) bool need_put = dn->inode_page ? false : true; int err; - /* if inode_page exists, index should be zero */ - f2fs_bug_on(F2FS_I_SB(dn->inode), !need_put && index); - err = get_dnode_of_data(dn, index, ALLOC_NODE); if (err) return err; @@ -951,7 +948,7 @@ static int f2fs_write_begin(struct file *file, struct address_space *mapping, { struct inode *inode = mapping->host; struct f2fs_sb_info *sbi = F2FS_I_SB(inode); - struct page *page; + struct page *page, *ipage; pgoff_t index = ((unsigned long long) pos) >> PAGE_CACHE_SHIFT; struct dnode_of_data dn; int err = 0; @@ -979,13 +976,26 @@ repeat: goto inline_data; f2fs_lock_op(sbi); - set_new_dnode(&dn, inode, NULL, NULL, 0); - err = f2fs_reserve_block(&dn, index); - f2fs_unlock_op(sbi); - if (err) { + + /* check inline_data */ + ipage = get_node_page(sbi, inode->i_ino); + if (IS_ERR(ipage)) + goto unlock_fail; + + if (f2fs_has_inline_data(inode)) { + f2fs_put_page(ipage, 1); + f2fs_unlock_op(sbi); f2fs_put_page(page, 0); - goto fail; + goto repeat; } + + set_new_dnode(&dn, inode, ipage, NULL, 0); + err = f2fs_reserve_block(&dn, index); + if (err) + goto unlock_fail; + f2fs_put_dnode(&dn); + f2fs_unlock_op(sbi); + inline_data: lock_page(page); if (unlikely(page->mapping != mapping)) { @@ -1038,6 +1048,10 @@ out: SetPageUptodate(page); clear_cold_data(page); return 0; + +unlock_fail: + f2fs_unlock_op(sbi); + f2fs_put_page(page, 0); fail: f2fs_write_failed(mapping, pos + len); return err; |