btrfs/162: Stop using device mount option
authorNikolay Borisov <nborisov@suse.com>
Fri, 24 Jul 2020 13:12:50 +0000 (16:12 +0300)
committerEryu Guan <guaneryu@gmail.com>
Sun, 26 Jul 2020 15:17:21 +0000 (23:17 +0800)
btrfs is clever enough to figure out which devices constitute the
sprout fs even without specifying them explicitly with -o device.
Additionally, explicitly settings the devices via -o device reduces
coverage of the test since it didn't detect breakage a local change
introduced. Without -o device instead this breakage was detected.

Signed-off-by: Nikolay Borisov <nborisov@suse.com>
Reviewed-by: Eryu Guan <guaneryu@gmail.com>
Signed-off-by: Eryu Guan <guaneryu@gmail.com>
tests/btrfs/162

index 7f119be057b70a86c7ee2da0a4b72b745c6f739a..ff3c50b1be54bfac81bf2f8beeb8ce467fe79224 100755 (executable)
@@ -69,11 +69,10 @@ create_sprout_seed()
 
 create_next_sprout()
 {
 
 create_next_sprout()
 {
-       run_check _mount -o device=$dev_seed $dev_sprout_seed $SCRATCH_MNT
+       run_check _mount $dev_sprout_seed $SCRATCH_MNT
        _run_btrfs_util_prog device add -f $dev_sprout $SCRATCH_MNT
        _scratch_unmount
        _run_btrfs_util_prog device add -f $dev_sprout $SCRATCH_MNT
        _scratch_unmount
-       run_check _mount -o device=$dev_seed,device=$dev_sprout_seed \
-               $dev_sprout $SCRATCH_MNT
+       run_check _mount $dev_sprout $SCRATCH_MNT
        echo -- sprout --
        od -x $SCRATCH_MNT/foobar
 }
        echo -- sprout --
        od -x $SCRATCH_MNT/foobar
 }