tests/bcachefs: always format with -f

Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>

2 files changed, 40 insertions, 40 deletions

diff --git a/tests/bcachefs/replication.ktest b/tests/bcachefs/replication.ktest
index 1041fef..f9b5fe7 100755
--- a/tests/bcachefs/replication.ktest
+++ b/tests/bcachefs/replication.ktest
@@ -18,7 +18,7 @@ test_recovery()
 {
     set_watchdog 180
 
-    run_quiet "" bcachefs format		\
+    run_quiet "" bcachefs format -f		\
 	--discard				\
 	--bucket=64k				\
 	--block_size=4k				\
@@ -105,7 +105,7 @@ test_replicas_variable_buckets()
     check_counters ${ktest_scratch_dev[0]}
 }
 
-test_copygc_torture()
+d_test_copygc_torture()
 {
     loops=$((($ktest_priority + 1) * 2))
 
@@ -170,7 +170,7 @@ do_remove_test()
 
     setup_tracing 'bcachefs:*'
 
-    run_quiet "" bcachefs format		\
+    run_quiet "" bcachefs format -f		\
 	--replicas=2				\
 	${ktest_scratch_dev[0]}			\
 	${ktest_scratch_dev[1]}			\
@@ -252,7 +252,7 @@ test_device_add()
     set_watchdog 240
     #setup_tracing 'bcachefs:*'
 
-    run_quiet "" bcachefs format		\
+    run_quiet "" bcachefs format -f		\
 	--block_size=4k				\
 	--no_initialize				\
 	${ktest_scratch_dev[0]}
@@ -265,7 +265,7 @@ test_device_add()
     sleep 1
 
     echo -n "adding ${ktest_scratch_dev[1]}... "
-    bcachefs device add /mnt ${ktest_scratch_dev[1]}
+    bcachefs device add -f /mnt ${ktest_scratch_dev[1]}
     echo "done"
 
     if ! wait $fiopid; then
@@ -289,9 +289,9 @@ test_device_add_label()
     # Caught bugs:
     #   - label was not set correctly; set to dev-0 label instead of new one.
 
-    bcachefs format -L test_add_label --label=foo ${ktest_scratch_dev[0]}
+    bcachefs format -f -L test_add_label --label=foo ${ktest_scratch_dev[0]}
     mount -t bcachefs ${ktest_scratch_dev[0]} /mnt
-    bcachefs device add --label=bar /mnt ${ktest_scratch_dev[1]}
+    bcachefs device add -f --label=bar /mnt ${ktest_scratch_dev[1]}
     expect_sysfs dev-1 label bar
     umount /mnt
 
@@ -308,9 +308,9 @@ test_device_add_label_compound()
 
     set_watchdog 30
 
-    bcachefs format -L test_add_compound_label --label=hdd ${ktest_scratch_dev[0]}
+    bcachefs format -f -L test_add_compound_label --label=hdd ${ktest_scratch_dev[0]}
     mount -t bcachefs ${ktest_scratch_dev[0]} /mnt
-    bcachefs device add --label=foo.bar /mnt ${ktest_scratch_dev[1]}
+    bcachefs device add -f --label=foo.bar /mnt ${ktest_scratch_dev[1]}
     expect_sysfs dev-1 label foo.bar
     umount /mnt
 
@@ -322,7 +322,7 @@ test_device_set_state()
 {
     set_watchdog 120
 
-    run_quiet "" bcachefs format		\
+    run_quiet "" bcachefs format -f		\
 	--replicas=2				\
 	${ktest_scratch_dev[0]}			\
 	${ktest_scratch_dev[1]}			\
@@ -359,7 +359,7 @@ test_device_ro()
 {
     set_watchdog 120
 
-    run_quiet "" bcachefs format		\
+    run_quiet "" bcachefs format -f		\
 	--btree_node_size=128k			\
 	${ktest_scratch_dev[0]}			\
 	${ktest_scratch_dev[1]}			\
@@ -392,7 +392,7 @@ test_device_ro()
 test_device_set_state_offline()
 {
     set_watchdog 120
-    run_quiet "" bcachefs format		\
+    run_quiet "" bcachefs format -f		\
 	--replicas=2				\
 	${ktest_scratch_dev[0]}			\
 	${ktest_scratch_dev[1]}			\
@@ -428,7 +428,7 @@ test_device_set_state_offline()
 test_device_readd()
 {
     set_watchdog 120
-    run_quiet "" bcachefs format		\
+    run_quiet "" bcachefs format -f		\
 	--replicas=2				\
 	${ktest_scratch_dev[0]}			\
 	${ktest_scratch_dev[1]}	
@@ -471,13 +471,13 @@ test_device_repeated_add_remove()
 
     set_watchdog 120
 
-    bcachefs format -L test_device_repeated_add_remove --label=hdd ${ktest_scratch_dev[0]}
+    bcachefs format -f -L test_device_repeated_add_remove --label=hdd ${ktest_scratch_dev[0]}
     mount -t bcachefs ${ktest_scratch_dev[0]} /mnt
 
     for ii in {1..10}; do
         echo "add-remove run #$ii ----------------------------------------------------"
         echo "bcachefs device add"
-        bcachefs device add /mnt ${ktest_scratch_dev[1]}
+        bcachefs device add -f /mnt ${ktest_scratch_dev[1]}
         echo "bcachefs device evacuate"
         bcachefs device evacuate ${ktest_scratch_dev[1]}
         echo "bcachefs device remove"
@@ -542,7 +542,7 @@ test_cmd_fs_usage()
 {
     set_watchdog 240
 
-    run_quiet "" bcachefs format		\
+    run_quiet "" bcachefs format -f		\
 	--replicas=2				\
 	--bucket=128k				\
 	${ktest_scratch_dev[0]}			\
@@ -606,7 +606,7 @@ disabled_test_device_add_faults()
 {
     setup_tracing 'bcachefs:*'
 
-    run_quiet "" bcachefs format		\
+    run_quiet "" bcachefs format -f		\
 	--errors=remount-ro			\
 	${ktest_scratch_dev[0]}
     mount ${ktest_scratch_dev[0]} /mnt
@@ -614,7 +614,7 @@ disabled_test_device_add_faults()
     device_add_fault_fn()
     {
 	set_faults "$1 enable"
-	! bcachefs device add /mnt ${ktest_scratch_dev[1]}
+	! bcachefs device add -f /mnt ${ktest_scratch_dev[1]}
     }
 
     run_fault_injection_test bcachefs:add			device_add_fault_fn
@@ -631,7 +631,7 @@ test_striping()
     setup_tracing 'bcachefs:*'
 
     if false; then
-	run_quiet "" bcachefs format		\
+	run_quiet "" bcachefs format -f		\
 	    --replicas=2			\
 	    ${ktest_scratch_dev[0]}		\
 	    ${ktest_scratch_dev[1]}
@@ -641,7 +641,7 @@ test_striping()
 	dd if=/dev/zero of=/mnt/test0 bs=1M count=1024 oflag=direct
 	bcachefs fs usage -h /mnt
 
-	bcachefs device add /mnt ${ktest_scratch_dev[2]}
+	bcachefs device add -f /mnt ${ktest_scratch_dev[2]}
 
 	dd if=/dev/zero of=/mnt/test1 bs=1M count=1024 oflag=direct
     else
@@ -674,7 +674,7 @@ test_striping()
 
 disabled_change_replicas()
 {
-    run_quiet "" bcachefs format		\
+    run_quiet "" bcachefs format -f		\
 	--replicas=2				\
 	${ktest_scratch_dev[0]}			\
 	${ktest_scratch_dev[1]}
@@ -707,7 +707,7 @@ disabled_change_replicas()
 
 disabled_change_replicas2()
 {
-    run_quiet "" bcachefs format		\
+    run_quiet "" bcachefs format -f		\
 	--replicas=2				\
 	${ktest_scratch_dev[0]}			\
 	${ktest_scratch_dev[1]}
diff --git a/tests/bcachefs/tier.ktest b/tests/bcachefs/tier.ktest
index d6ce3e8..8973532 100755
--- a/tests/bcachefs/tier.ktest
+++ b/tests/bcachefs/tier.ktest
@@ -24,7 +24,7 @@ run_basic_tiering_test()
 
 test_tiering_torture()
 {
-    run_quiet "" bcachefs format		\
+    run_quiet "" bcachefs format -f		\
 	--block_size=4k				\
 	--bucket=8M				\
 	--label=ssd.ssd1 ${ktest_scratch_dev[0]}		\
@@ -71,14 +71,14 @@ test_tiering_buffered()
 {
     set_watchdog 6000
 
-    run_quiet "" bcachefs format		\
-	--block_size=4k				\
-	--label=ssd.ssd1 ${ktest_scratch_dev[0]}		\
-	--label=ssd.ssd2 ${ktest_scratch_dev[1]}		\
-	--label=hdd.hdd1 ${ktest_scratch_dev[2]}		\
-	--label=hdd.hdd2 ${ktest_scratch_dev[3]}		\
-	--foreground_target=ssd			\
-	--promote_target=ssd			\
+    run_quiet "" bcachefs format -f			\
+	--block_size=4k					\
+	--label=ssd.ssd1 ${ktest_scratch_dev[0]}	\
+	--label=ssd.ssd2 ${ktest_scratch_dev[1]}	\
+	--label=hdd.hdd1 ${ktest_scratch_dev[2]}	\
+	--label=hdd.hdd2 ${ktest_scratch_dev[3]}	\
+	--foreground_target=ssd				\
+	--promote_target=ssd				\
 	--background_target=hdd
 
     mount -t bcachefs "$(join_by : "${ktest_scratch_dev[@]}")" /mnt
@@ -128,7 +128,7 @@ test_setattr()
 {
     setup_tracing 'bcachefs:*'
 
-    run_quiet "" bcachefs format		\
+    run_quiet "" bcachefs format -f				\
 	--durability=0 --label=ssd ${ktest_scratch_dev[0]}	\
 	--durability=1 --label=hdd ${ktest_scratch_dev[2]}	\
 	--background_target=hdd
@@ -204,7 +204,7 @@ test_tiering_variable_buckets_replicas()
 test_device_add()
 {
     set_watchdog 60
-    run_quiet "" bcachefs format					\
+    run_quiet "" bcachefs format -f					\
 	--label=ssd ${ktest_scratch_dev[0]}				\
 	--label=hdd ${ktest_scratch_dev[2]} ${ktest_scratch_dev[3]}
 
@@ -212,7 +212,7 @@ test_device_add()
 
     run_fio_randrw|tail -n200 &
 
-    bcachefs device add --label=hdd /mnt ${ktest_scratch_dev[1]}
+    bcachefs device add -f --label=hdd /mnt ${ktest_scratch_dev[1]}
 
     wait
     umount /mnt
@@ -244,7 +244,7 @@ test_mount_umount_torture()
 test_change_replicas()
 {
     set_watchdog 180
-    run_quiet "" bcachefs format					\
+    run_quiet "" bcachefs format -f					\
 	--label=ssd ${ktest_scratch_dev[0]} ${ktest_scratch_dev[1]}	\
 	--label=hdd ${ktest_scratch_dev[2]} ${ktest_scratch_dev[3]}	\
 	--foreground_target=ssd						\
@@ -292,11 +292,11 @@ test_concurrent_all_device_removal()
 {
     set_watchdog 120
 
-    run_quiet "" bcachefs format \
-       --label=ssd.ssd1 ${ktest_scratch_dev[0]}                \
-       --label=ssd.ssd2 ${ktest_scratch_dev[1]}                \
-       --label=hdd.hdd1 ${ktest_scratch_dev[2]}                \
-       --label=hdd.hdd2 ${ktest_scratch_dev[3]}                \
+    run_quiet "" bcachefs format -f			\
+       --label=ssd.ssd1 ${ktest_scratch_dev[0]}		\
+       --label=ssd.ssd2 ${ktest_scratch_dev[1]}		\
+       --label=hdd.hdd1 ${ktest_scratch_dev[2]}		\
+       --label=hdd.hdd2 ${ktest_scratch_dev[3]}		\
        --metadata_replicas=3 \
        --data_replicas=3 \
        --promote_target=ssd