1 files changed, 8 insertions, 2 deletions

diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index efce9a2fa9be..10a2a579cc7f 100644
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -610,7 +610,7 @@ static int btree_readpage_end_io_hook(struct btrfs_io_bio *io_bio,
          * that we don't try and read the other copies of this block, just
          * return -EIO.
          */
-        if (found_level == 0 && btrfs_check_leaf(root, eb)) {
+        if (found_level == 0 && btrfs_check_leaf_full(root, eb)) {
                 set_bit(EXTENT_BUFFER_CORRUPT, &eb->bflags);
                 ret = -EIO;
         }
@@ -3848,7 +3848,13 @@ void btrfs_mark_buffer_dirty(struct extent_buffer *buf)
                                          buf->len,
                                          fs_info->dirty_metadata_batch);
 #ifdef CONFIG_BTRFS_FS_CHECK_INTEGRITY
-        if (btrfs_header_level(buf) == 0 && btrfs_check_leaf(root, buf)) {
+        /*
+         * Since btrfs_mark_buffer_dirty() can be called with item pointer set
+         * but item data not updated.
+         * So here we should only check item pointers, not item data.
+         */
+        if (btrfs_header_level(buf) == 0 &&
+            btrfs_check_leaf_relaxed(root, buf)) {
                 btrfs_print_leaf(buf);
                 ASSERT(0);
         }