Commit ead43275 authored by Jaegeuk Kim's avatar Jaegeuk Kim

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: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent ccfb3000
...@@ -659,13 +659,13 @@ static int expand_inode_data(struct inode *inode, loff_t offset, ...@@ -659,13 +659,13 @@ static int expand_inode_data(struct inode *inode, loff_t offset,
off_start = offset & (PAGE_CACHE_SIZE - 1); off_start = offset & (PAGE_CACHE_SIZE - 1);
off_end = (offset + len) & (PAGE_CACHE_SIZE - 1); off_end = (offset + len) & (PAGE_CACHE_SIZE - 1);
f2fs_lock_op(sbi);
for (index = pg_start; index <= pg_end; index++) { for (index = pg_start; index <= pg_end; index++) {
struct dnode_of_data dn; struct dnode_of_data dn;
f2fs_lock_op(sbi);
set_new_dnode(&dn, inode, NULL, NULL, 0); set_new_dnode(&dn, inode, NULL, NULL, 0);
ret = f2fs_reserve_block(&dn, index); ret = f2fs_reserve_block(&dn, index);
f2fs_unlock_op(sbi);
if (ret) if (ret)
break; break;
...@@ -683,8 +683,9 @@ static int expand_inode_data(struct inode *inode, loff_t offset, ...@@ -683,8 +683,9 @@ static int expand_inode_data(struct inode *inode, loff_t offset,
i_size_read(inode) < new_size) { i_size_read(inode) < new_size) {
i_size_write(inode, new_size); i_size_write(inode, new_size);
mark_inode_dirty(inode); mark_inode_dirty(inode);
f2fs_write_inode(inode, NULL); update_inode_page(inode);
} }
f2fs_unlock_op(sbi);
return ret; return ret;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment