Merge tag 'f2fs-for-5.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeu...

[sfrench/cifs-2.6.git] / fs / f2fs / node.c

diff --git a/fs/f2fs/node.c b/fs/f2fs/node.c
index 8ccff18560ff1af4ca8fc35a3dd56ddd6a14a5ed..836c79a20afc6bc7e6ed4612971aa844c7d2d24d 100644 (file)
--- a/fs/f2fs/node.c
+++ b/fs/f2fs/node.c
@@ -90,10 +90,6 @@ bool f2fs_available_free_memory(struct f2fs_sb_info *sbi, int type)
                                atomic_read(&sbi->total_ext_node) *
                                sizeof(struct extent_node)) >> PAGE_SHIFT;
                res = mem_size < ((avail_ram * nm_i->ram_thresh / 100) >> 1);
-       } else if (type == INMEM_PAGES) {
-               /* it allows 20% / total_ram for inmemory pages */
-               mem_size = get_pages(sbi, F2FS_INMEM_PAGES);
-               res = mem_size < (val.totalram / 5);
        } else if (type == DISCARD_CACHE) {
                mem_size = (atomic_read(&dcc->discard_cmd_cnt) *
                                sizeof(struct discard_cmd)) >> PAGE_SHIFT;
@@ -1416,8 +1412,7 @@ repeat:
 
        err = read_node_page(page, 0);
        if (err < 0) {
-               f2fs_put_page(page, 1);
-               return ERR_PTR(err);
+               goto out_put_err;
        } else if (err == LOCKED_PAGE) {
                err = 0;
                goto page_hit;
@@ -1443,19 +1438,21 @@ repeat:
                goto out_err;
        }
 page_hit:
-       if (unlikely(nid != nid_of_node(page))) {
-               f2fs_warn(sbi, "inconsistent node block, nid:%lu, node_footer[nid:%u,ino:%u,ofs:%u,cpver:%llu,blkaddr:%u]",
+       if (likely(nid == nid_of_node(page)))
+               return page;
+
+       f2fs_warn(sbi, "inconsistent node block, nid:%lu, node_footer[nid:%u,ino:%u,ofs:%u,cpver:%llu,blkaddr:%u]",
                          nid, nid_of_node(page), ino_of_node(page),
                          ofs_of_node(page), cpver_of_node(page),
                          next_blkaddr_of_node(page));
-               set_sbi_flag(sbi, SBI_NEED_FSCK);
-               err = -EINVAL;
+       set_sbi_flag(sbi, SBI_NEED_FSCK);
+       err = -EINVAL;
 out_err:
-               ClearPageUptodate(page);
-               f2fs_put_page(page, 1);
-               return ERR_PTR(err);
-       }
-       return page;
+       ClearPageUptodate(page);
+out_put_err:
+       f2fs_handle_page_eio(sbi, page->index, NODE);
+       f2fs_put_page(page, 1);
+       return ERR_PTR(err);
 }
 
 struct page *f2fs_get_node_page(struct f2fs_sb_info *sbi, pgoff_t nid)
@@ -1631,7 +1628,7 @@ static int __write_node_page(struct page *page, bool atomic, bool *submitted,
                goto redirty_out;
        }
 
-       if (atomic && !test_opt(sbi, NOBARRIER))
+       if (atomic && !test_opt(sbi, NOBARRIER) && !f2fs_sb_has_blkzoned(sbi))
                fio.op_flags |= REQ_PREFLUSH | REQ_FUA;
 
        /* should add to global list before clearing PAGECACHE status */