[PATCH] Fstests: btrfs/011 fix device mounted when tests aborts

[PATCH] Fstests: btrfs/011 fix device mounted when tests aborts

[Liu Bo]

One of btrfs tests, btrfs/011, uses SCRATCH_DEV_POOL and puts a
non-SCRATCH_DEV device as the first one when doing mkfs, and this makes
_require_scratch{_nocheck} confused since it checks mount point with
SCRATCH_DEV only.

This adds _scratch_umount to cleanup() to umount SCRATCH_MNT by
011 itself.

Signed-off-by: Liu Bo <bo.li.liu@oracle.com>
---
 tests/btrfs/011 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/btrfs/011 b/tests/btrfs/011
index 28f1388..f4c5309 100755
--- a/tests/btrfs/011
+++ b/tests/btrfs/011
@@ -51,6 +51,7 @@ _cleanup()
 	fi
 	wait
 	rm -f $tmp.tmp
+	_scratch_unmount > /dev/null 2>&1
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
-- 
2.5.0

Re: [PATCH] Fstests: btrfs/011 fix device mounted when tests aborts

[Anand Jain]

On 01/17/2018 04:10 AM, Liu Bo wrote:
> One of btrfs tests, btrfs/011, uses SCRATCH_DEV_POOL and puts a
> non-SCRATCH_DEV device as the first one when doing mkfs, and this makes
> _require_scratch{_nocheck} confused since it checks mount point with
> SCRATCH_DEV only.
> 
> This adds _scratch_umount to cleanup() to umount SCRATCH_MNT by
> 011 itself.
> 
> Signed-off-by: Liu Bo <bo.li.liu@oracle.com>

Reviewed-by: Anand Jain <anand.jain@oracle.com>
Tested-by: Anand Jain <anand.jain@oracle.com>

Thanks, Anand

> ---
>   tests/btrfs/011 | 1 +
>   1 file changed, 1 insertion(+)
> 
> diff --git a/tests/btrfs/011 b/tests/btrfs/011
> index 28f1388..f4c5309 100755
> --- a/tests/btrfs/011
> +++ b/tests/btrfs/011
> @@ -51,6 +51,7 @@ _cleanup()
>   	fi
>   	wait
>   	rm -f $tmp.tmp
> +	_scratch_unmount > /dev/null 2>&1
>   }
>   trap "_cleanup; exit \$status" 0 1 2 3 15
>   
>