f2fs: check its block allocation to avoid producing wrong dirty pages

[GitHub/exynos8895/android_kernel_samsung_universal8895.git] / fs / f2fs / data.c

diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index ad99b7a295b4e2c72407342c10a96080c50bc778..389fda772e69fae8c636543c67dc5b7a1db0f697 100644 (file)
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -806,16 +806,30 @@ struct page *find_data_page(struct inode *inode, pgoff_t index, bool sync)
        struct address_space *mapping = inode->i_mapping;
        struct dnode_of_data dn;
        struct page *page;
+       struct extent_info ei;
        int err;
        struct f2fs_io_info fio = {
                .type = DATA,
                .rw = sync ? READ_SYNC : READA,
        };
 
+       /*
+        * If sync is false, it needs to check its block allocation.
+        * This is need and triggered by two flows:
+        *   gc and truncate_partial_data_page.
+        */
+       if (!sync)
+               goto search;
+
        page = find_get_page(mapping, index);
        if (page && PageUptodate(page))
                return page;
        f2fs_put_page(page, 0);
+search:
+       if (f2fs_lookup_extent_cache(inode, index, &ei)) {
+               dn.data_blkaddr = ei.blk + index - ei.fofs;
+               goto got_it;
+       }
 
        set_new_dnode(&dn, inode, NULL, NULL, 0);
        err = get_dnode_of_data(&dn, index, LOOKUP_NODE);
@@ -830,6 +844,7 @@ struct page *find_data_page(struct inode *inode, pgoff_t index, bool sync)
        if (unlikely(dn.data_blkaddr == NEW_ADDR))
                return ERR_PTR(-EINVAL);
 
+got_it:
        page = grab_cache_page(mapping, index);
        if (!page)
                return ERR_PTR(-ENOMEM);
@@ -864,6 +879,7 @@ struct page *get_lock_data_page(struct inode *inode, pgoff_t index)
        struct address_space *mapping = inode->i_mapping;
        struct dnode_of_data dn;
        struct page *page;
+       struct extent_info ei;
        int err;
        struct f2fs_io_info fio = {
                .type = DATA,
@@ -874,6 +890,11 @@ repeat:
        if (!page)
                return ERR_PTR(-ENOMEM);
 
+       if (f2fs_lookup_extent_cache(inode, index, &ei)) {
+               dn.data_blkaddr = ei.blk + index - ei.fofs;
+               goto got_it;
+       }
+
        set_new_dnode(&dn, inode, NULL, NULL, 0);
        err = get_dnode_of_data(&dn, index, LOOKUP_NODE);
        if (err) {
@@ -887,6 +908,7 @@ repeat:
                return ERR_PTR(-ENOENT);
        }
 
+got_it:
        if (PageUptodate(page))
                return page;
 
@@ -1245,8 +1267,10 @@ int do_write_data_page(struct page *page, struct f2fs_io_info *fio)
        fio->blk_addr = dn.data_blkaddr;
 
        /* This page is already truncated */
-       if (fio->blk_addr == NULL_ADDR)
+       if (fio->blk_addr == NULL_ADDR) {
+               ClearPageUptodate(page);
                goto out_writepage;
+       }
 
        set_page_writeback(page);
 
@@ -1341,6 +1365,8 @@ done:
        clear_cold_data(page);
 out:
        inode_dec_dirty_pages(inode);
+       if (err)
+               ClearPageUptodate(page);
        unlock_page(page);
        if (need_balance_fs)
                f2fs_balance_fs(sbi);