1 files changed, 9 insertions, 8 deletions

diff --git a/fs/btrfs/scrub.c b/fs/btrfs/scrub.c
index 572306036477..6702896cdb8f 100644
--- a/fs/btrfs/scrub.c
+++ b/fs/btrfs/scrub.c
@@ -1151,11 +1151,6 @@ static int scrub_handle_errored_block(struct scrub_block *sblock_to_check)
                 return ret;
         }
 
-        if (sctx->is_dev_replace && !is_metadata && !have_csum) {
-                sblocks_for_recheck = NULL;
-                goto nodatasum_case;
-        }
-
         /*
          * read all mirrors one after the other. This includes to
          * re-read the extent or metadata block that failed (that was
@@ -1268,13 +1263,19 @@ static int scrub_handle_errored_block(struct scrub_block *sblock_to_check)
                 goto out;
         }
 
-        if (!is_metadata && !have_csum) {
+        /*
+         * NOTE: Even for nodatasum case, it's still possible that it's a
+         * compressed data extent, thus scrub_fixup_nodatasum(), which write
+         * inode page cache onto disk, could cause serious data corruption.
+         *
+         * So here we could only read from disk, and hope our recovery could
+         * reach disk before the newer write.
+         */
+        if (0 && !is_metadata && !have_csum) {
                 struct scrub_fixup_nodatasum *fixup_nodatasum;
 
                 WARN_ON(sctx->is_dev_replace);
 
-nodatasum_case:
-
                 /*
                  * !is_metadata and !have_csum, this means that the data
                  * might not be COWed, that it might be modified