From: Jaegeuk Kim Date: Tue, 16 Jun 2015 22:17:01 +0000 (-0700) Subject: f2fs: update on-disk extents even under extent_cache X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=cbe91923a97c96d6a931f4b5b7e32083218a0251;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git f2fs: update on-disk extents even under extent_cache Previously, f2fs_update_extent_cache() updates in-memory extent_cache all the time, and then finally preserves its up-to-date extent into on-disk one during f2fs_evict_inode. But, in the following scenario: 1. mount 2. open & write an extent X 3. f2fs_evict_inode; on-disk extent is X 4. open & update the extent X with Y 5. sync; trigger checkpoint 6. power-cut after power-on, f2fs should serve extent Y, but we have an on-disk extent X. This causes a failure on xfstests/311. Reviewed-by: Chao Yu Signed-off-by: Jaegeuk Kim --- diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c index d1d86d53d1dc..176e4ad4e5ed 100644 --- a/fs/f2fs/data.c +++ b/fs/f2fs/data.c @@ -899,9 +899,9 @@ void f2fs_update_extent_cache(struct dnode_of_data *dn) fofs = start_bidx_of_node(ofs_of_node(dn->node_page), fi) + dn->ofs_in_node; + /* we should call update_extent_info() to update on-disk extent */ if (test_opt(F2FS_I_SB(dn->inode), EXTENT_CACHE)) - return f2fs_update_extent_tree(dn->inode, fofs, - dn->data_blkaddr); + f2fs_update_extent_tree(dn->inode, fofs, dn->data_blkaddr); if (update_extent_info(dn->inode, fofs, dn->data_blkaddr)) sync_inode_page(dn);