f2fs: check node page contents all the time

In get_node_page, if the page is up-to-date, we assumed that the page was not
reclaimed at all.
But, sometimes it was reported that its contents was missing.
So, just for sure, let's check its mapping and contents.

Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>

diff --git a/fs/f2fs/node.c b/fs/f2fs/node.c
index ea22c3210c8a1879b2b31ea2094fbe398fc03e20..1e354ff9f7d85806daa646b4e1abbe0c076373d7 100644 (file)
--- a/fs/f2fs/node.c
+++ b/fs/f2fs/node.c
@@ -1036,11 +1036,11 @@ repeat:
        err = read_node_page(page, READ_SYNC);
        if (err < 0)
                return ERR_PTR(err);
-       else if (err == LOCKED_PAGE)
-               goto got_it;
+       else if (err != LOCKED_PAGE)
+               lock_page(page);
 
-       lock_page(page);
        if (unlikely(!PageUptodate(page) || nid != nid_of_node(page))) {
+               ClearPageUptodate(page);
                f2fs_put_page(page, 1);
                return ERR_PTR(-EIO);
        }
@@ -1048,7 +1048,6 @@ repeat:
                f2fs_put_page(page, 1);
                goto repeat;
        }
-got_it:
        return page;
 }