Pārlūkot izejas kodu

f2fs: don't check inode's checksum if it was dirtied or writebacked

If another thread already made the page dirtied or writebacked, we must avoid
to verify checksum. If we got an error, we need to remove its uptodate as well.

Reviewed-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Jaegeuk Kim 8 gadi atpakaļ
vecāks
revīzija
ee60523499
2 mainītis faili ar 3 papildinājumiem un 2 dzēšanām
  1. 2 1
      fs/f2fs/inode.c
  2. 1 1
      fs/f2fs/node.c

+ 2 - 1
fs/f2fs/inode.c

@@ -153,7 +153,8 @@ bool f2fs_inode_chksum_verify(struct f2fs_sb_info *sbi, struct page *page)
 	struct f2fs_inode *ri;
 	struct f2fs_inode *ri;
 	__u32 provided, calculated;
 	__u32 provided, calculated;
 
 
-	if (!f2fs_enable_inode_chksum(sbi, page))
+	if (!f2fs_enable_inode_chksum(sbi, page) ||
+			PageDirty(page) || PageWriteback(page))
 		return true;
 		return true;
 
 
 	ri = &F2FS_NODE(page)->i;
 	ri = &F2FS_NODE(page)->i;

+ 1 - 1
fs/f2fs/node.c

@@ -1187,9 +1187,9 @@ page_hit:
 			nid, nid_of_node(page), ino_of_node(page),
 			nid, nid_of_node(page), ino_of_node(page),
 			ofs_of_node(page), cpver_of_node(page),
 			ofs_of_node(page), cpver_of_node(page),
 			next_blkaddr_of_node(page));
 			next_blkaddr_of_node(page));
-		ClearPageUptodate(page);
 		err = -EINVAL;
 		err = -EINVAL;
 out_err:
 out_err:
+		ClearPageUptodate(page);
 		f2fs_put_page(page, 1);
 		f2fs_put_page(page, 1);
 		return ERR_PTR(err);
 		return ERR_PTR(err);
 	}
 	}