btrfs: skip tests exercising data corruption and repair when using nodatasum

Several tests exercise corrupting data and then checking that on read the
data is repaired, but this requires using checksums, so the tests fail
when running with the nodatasum mount option.

So add a _require_btrfs_no_nodatasum call to these tests.

Signed-off-by: Filipe Manana <fdmanana@suse.com>
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: Qu Wenruo <wqu@suse.com>
Reviewed-by: Anand Jain <anand.jain@oracle.com>
Signed-off-by: Zorro Lang <zlang@kernel.org>

diff --git a/tests/btrfs/140 b/tests/btrfs/140
index b2c8451dd9c29719a778b766c00fbf6d60f331dd..cb70f9676e1a6e37c2e2466cf3df5a5b98d94edd 100755 (executable)
--- a/tests/btrfs/140
+++ b/tests/btrfs/140
@@ -17,8 +17,10 @@ _begin_fstest auto quick read_repair fiemap
 . ./common/filter
 
 _require_scratch_dev_pool 2
-# No data checksums for NOCOW case, so can't detect corruption and repair data.
+# No data checksums for NOCOW and NODATACOW cases, so can't detect corruption
+# and repair data.
 _require_btrfs_no_nodatacow
+_require_btrfs_no_nodatasum
 _require_btrfs_command inspect-internal dump-tree
 _require_odirect
 # Overwriting data is forbidden on a zoned block device

diff --git a/tests/btrfs/141 b/tests/btrfs/141
index 3d48dff3500f60a427172ef90f2dde5d14bc4917..4afd3304ee73e454f5f25daa3b8740e5d8ef1ed8 100755 (executable)
--- a/tests/btrfs/141
+++ b/tests/btrfs/141
@@ -17,8 +17,10 @@ _begin_fstest auto quick read_repair
 
 . ./common/filter
 
-# No data checksums for NOCOW case, so can't detect corruption and repair data.
+# No data checksums for NOCOW and NODATACOW cases, so can't detect corruption
+# and repair data.
 _require_btrfs_no_nodatacow
+_require_btrfs_no_nodatasum
 _require_scratch_dev_pool 2
 
 _require_btrfs_command inspect-internal dump-tree

diff --git a/tests/btrfs/157 b/tests/btrfs/157
index c49229f0b3042d0838e34e9de926687361bccbfd..00393fc87d3c1c059c0761f34c14fbd79becab1e 100755 (executable)
--- a/tests/btrfs/157
+++ b/tests/btrfs/157
@@ -25,8 +25,10 @@ _begin_fstest auto quick raid read_repair
 
 . ./common/filter
 
-# No data checksums for NOCOW case, so can't detect corruption and repair data.
+# No data checksums for NOCOW and NODATACOW cases, so can't detect corruption
+# and repair data.
 _require_btrfs_no_nodatacow
+_require_btrfs_no_nodatasum
 _require_scratch_dev_pool 4
 _require_btrfs_command inspect-internal dump-tree
 _require_btrfs_raid_type raid6

diff --git a/tests/btrfs/158 b/tests/btrfs/158
index ff28defea07a12a343da0d61674f7ad09b1479f4..87d16cdfbd3dccf4800ca90a697609aba4904c01 100755 (executable)
--- a/tests/btrfs/158
+++ b/tests/btrfs/158
@@ -17,8 +17,10 @@ _begin_fstest auto quick raid scrub
 
 . ./common/filter
 
-# No data checksums for NOCOW case, so can't detect corruption and repair data.
+# No data checksums for NOCOW and NODATACOW cases, so can't detect corruption
+# and repair data.
 _require_btrfs_no_nodatacow
+_require_btrfs_no_nodatasum
 _require_scratch_dev_pool 4
 _require_btrfs_command inspect-internal dump-tree
 _require_btrfs_raid_type raid5

diff --git a/tests/btrfs/215 b/tests/btrfs/215
index 2418cc90796d531243a7ae1a853a5c6b44c990ab..bd82fb79bfb07b04bc8dae8ed195d12d574db55d 100755 (executable)
--- a/tests/btrfs/215
+++ b/tests/btrfs/215
@@ -21,8 +21,10 @@ get_physical()
 }
 
 _require_scratch
-# No data checksums for NOCOW case, so can't detect corruption and repair data.
+# No data checksums for NOCOW and NODATACOW cases, so can't detect corruption
+# and repair data.
 _require_btrfs_no_nodatacow
+_require_btrfs_no_nodatasum
 # Overwriting data is forbidden on a zoned block device
 _require_non_zoned_device $SCRATCH_DEV
 # We need to ensure a fixed amount of written blocks to trigger a specific

diff --git a/tests/btrfs/265 b/tests/btrfs/265
index 5640e714a92008a39a9c404bf18e4b84ecb1b686..823d4d967fc0f27d9068ac19a9dd55a546967fd9 100755 (executable)
--- a/tests/btrfs/265
+++ b/tests/btrfs/265
@@ -15,8 +15,10 @@ _begin_fstest auto quick read_repair
 
 _require_scratch_dev_pool 3
 
-# No data checksums for NOCOW case, so can't detect corruption and repair data.
+# No data checksums for NOCOW and NODATACOW cases, so can't detect corruption
+# and repair data.
 _require_btrfs_no_nodatacow
+_require_btrfs_no_nodatasum
 _require_odirect
 # Overwriting data is forbidden on a zoned block device
 _require_non_zoned_device "${SCRATCH_DEV}"

diff --git a/tests/btrfs/266 b/tests/btrfs/266
index 681cefda100bf5d027506c457226dcade261e018..bffcec27903c3b81b96a286bff40cc80e3e53877 100755 (executable)
--- a/tests/btrfs/266
+++ b/tests/btrfs/266
@@ -14,8 +14,10 @@ _begin_fstest auto quick read_repair
 
 . ./common/filter
 
-# No data checksums for NOCOW case, so can't detect corruption and repair data.
+# No data checksums for NOCOW and NODATACOW cases, so can't detect corruption
+# and repair data.
 _require_btrfs_no_nodatacow
+_require_btrfs_no_nodatasum
 _require_scratch_dev_pool 3
 
 _require_odirect

diff --git a/tests/btrfs/267 b/tests/btrfs/267
index ceba974df18ade8b41b7af71cdafee637c656d8f..b4ea31063d207f72769cacd078b3869204048977 100755 (executable)
--- a/tests/btrfs/267
+++ b/tests/btrfs/267
@@ -16,8 +16,10 @@ _begin_fstest auto quick read_repair
 
 _require_scratch_dev_pool 3
 
-# No data checksums for NOCOW case, so can't detect corruption and repair data.
+# No data checksums for NOCOW and NODATACOW cases, so can't detect corruption
+# and repair data.
 _require_btrfs_no_nodatacow
+_require_btrfs_no_nodatasum
 _require_odirect
 # Overwriting data is forbidden on a zoned block device
 _require_non_zoned_device "${SCRATCH_DEV}"

diff --git a/tests/btrfs/268 b/tests/btrfs/268
index 99e1ee4a2d40b019500d7ad3bd45fcd38d7668ed..7681b1a55e9845fa2b9389b255ada4fdd612737f 100755 (executable)
--- a/tests/btrfs/268
+++ b/tests/btrfs/268
@@ -15,8 +15,10 @@ _begin_fstest auto quick read_repair
 
 _require_scratch
 _require_odirect
-# No data checksums for NOCOW case, so can't detect corruption and repair data.
+# No data checksums for NOCOW and NODATACOW cases, so can't detect corruption
+# and repair data.
 _require_btrfs_no_nodatacow
+_require_btrfs_no_nodatasum
 _require_non_zoned_device "${SCRATCH_DEV}" # no overwrites on zoned devices
 _require_scratch_dev_pool 2
 _scratch_dev_pool_get 2

diff --git a/tests/btrfs/269 b/tests/btrfs/269
index 183aeb736b71db140974c5bc67cbaa77e249e0db..c048da44438e9425f027aaa143c3a49f93ee28b5 100755 (executable)
--- a/tests/btrfs/269
+++ b/tests/btrfs/269
@@ -19,8 +19,10 @@ _begin_fstest auto quick read_repair
 
 _require_scratch
 _require_odirect
-# No data checksums for NOCOW case, so can't detect corruption and repair data.
+# No data checksums for NOCOW and NODATACOW cases, so can't detect corruption
+# and repair data.
 _require_btrfs_no_nodatacow
+_require_btrfs_no_nodatasum
 _require_non_zoned_device "${SCRATCH_DEV}" # no overwrites on zoned devices
 # We need to ensure a fixed extent size and we corrupt by writing directly to
 # the device, so skip if compression is enabled.

diff --git a/tests/btrfs/289 b/tests/btrfs/289
index b340b97dc1659e47b2fa72b5927eb2a2c20b376a..1e8336a7e200fcdc0ae47a6f8c5c50bbae5f657a 100755 (executable)
--- a/tests/btrfs/289
+++ b/tests/btrfs/289
@@ -12,8 +12,10 @@ _begin_fstest auto quick scrub repair
 . ./common/filter
 
 _require_scratch
-# No data checksums for NOCOW case, so can't detect corruption and repair data.
+# No data checksums for NOCOW and NODATACOW cases, so can't detect corruption
+# and repair data.
 _require_btrfs_no_nodatacow
+_require_btrfs_no_nodatasum
 
 _require_odirect
 # Overwriting data is forbidden on a zoned block device