diff options
| author | Jaegeuk Kim <jaegeuk@kernel.org> | 2014-06-13 00:05:55 -0400 |
|---|---|---|
| committer | Jaegeuk Kim <jaegeuk@kernel.org> | 2014-06-22 21:05:08 -0400 |
| commit | ead432756ab2c76b1f1de742a1c8a06992cb98eb (patch) | |
| tree | e56de605c8662d8c9efc48520f4a4374ca14ed98 /fs/f2fs | |
| parent | ccfb30001f37ace4690a74c27b4812cf054e123a (diff) | |
f2fs: recover fallocated data and its i_size together
This patch arranges the f2fs_locks to cover the fallocated data and its i_size.
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Diffstat (limited to 'fs/f2fs')
| -rw-r--r-- | fs/f2fs/file.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c index c58e33075719..f6c4bdaaae86 100644 --- a/fs/f2fs/file.c +++ b/fs/f2fs/file.c | |||
| @@ -659,13 +659,13 @@ static int expand_inode_data(struct inode *inode, loff_t offset, | |||
| 659 | off_start = offset & (PAGE_CACHE_SIZE - 1); | 659 | off_start = offset & (PAGE_CACHE_SIZE - 1); |
| 660 | off_end = (offset + len) & (PAGE_CACHE_SIZE - 1); | 660 | off_end = (offset + len) & (PAGE_CACHE_SIZE - 1); |
| 661 | 661 | ||
| 662 | f2fs_lock_op(sbi); | ||
| 663 | |||
| 662 | for (index = pg_start; index <= pg_end; index++) { | 664 | for (index = pg_start; index <= pg_end; index++) { |
| 663 | struct dnode_of_data dn; | 665 | struct dnode_of_data dn; |
| 664 | 666 | ||
| 665 | f2fs_lock_op(sbi); | ||
| 666 | set_new_dnode(&dn, inode, NULL, NULL, 0); | 667 | set_new_dnode(&dn, inode, NULL, NULL, 0); |
| 667 | ret = f2fs_reserve_block(&dn, index); | 668 | ret = f2fs_reserve_block(&dn, index); |
| 668 | f2fs_unlock_op(sbi); | ||
| 669 | if (ret) | 669 | if (ret) |
| 670 | break; | 670 | break; |
| 671 | 671 | ||
| @@ -683,8 +683,9 @@ static int expand_inode_data(struct inode *inode, loff_t offset, | |||
| 683 | i_size_read(inode) < new_size) { | 683 | i_size_read(inode) < new_size) { |
| 684 | i_size_write(inode, new_size); | 684 | i_size_write(inode, new_size); |
| 685 | mark_inode_dirty(inode); | 685 | mark_inode_dirty(inode); |
| 686 | f2fs_write_inode(inode, NULL); | 686 | update_inode_page(inode); |
| 687 | } | 687 | } |
| 688 | f2fs_unlock_op(sbi); | ||
| 688 | 689 | ||
| 689 | return ret; | 690 | return ret; |
| 690 | } | 691 | } |