f2fs: clear page's up-to-date if block was deallocated

If page's on-disk block was deallocated, let's remove up-to-date flag to avoid
further access with wrong contents.

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

diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index ae5c41444e8f0d82153c74ea56073afb55aa5448..62e31b2aa131b823117441b93bd017d8b5753508 100644 (file)
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -1259,8 +1259,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);
 
@@ -1355,6 +1357,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);

diff --git a/fs/f2fs/dir.c b/fs/f2fs/dir.c
index 583896cb5346f48d729f43daa516cecd5fd3919a..590aeef6f85ea5932f6eac4f16264236ce7a58a2 100644 (file)
--- a/fs/f2fs/dir.c
+++ b/fs/f2fs/dir.c
@@ -682,6 +682,7 @@ void f2fs_delete_entry(struct f2fs_dir_entry *dentry, struct page *page,
        if (bit_pos == NR_DENTRY_IN_BLOCK) {
                truncate_hole(dir, page->index, page->index + 1);
                clear_page_dirty_for_io(page);
+               ClearPagePrivate(page);
                ClearPageUptodate(page);
                inode_dec_dirty_pages(dir);
        }

diff --git a/fs/f2fs/node.c b/fs/f2fs/node.c
index 28423697e97acf4e940cec3535af15743d2b1391..35a911722d59658b3cd2a1d9d811f0dd3266c162 100644 (file)
--- a/fs/f2fs/node.c
+++ b/fs/f2fs/node.c
@@ -1002,6 +1002,7 @@ static int read_node_page(struct page *page, int rw)
        get_node_info(sbi, page->index, &ni);
 
        if (unlikely(ni.blk_addr == NULL_ADDR)) {
+               ClearPageUptodate(page);
                f2fs_put_page(page, 1);
                return -ENOENT;
        }
@@ -1313,6 +1314,7 @@ static int f2fs_write_node_page(struct page *page,
 
        /* This page is already truncated */
        if (unlikely(ni.blk_addr == NULL_ADDR)) {
+               ClearPageUptodate(page);
                dec_page_count(sbi, F2FS_DIRTY_NODES);
                unlock_page(page);
                return 0;