apfs/apfstests
0
0
Fork 0
mirror of https://github.com/linux-apfs/apfstests.git synced 2026-05-01 15:01:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

common/dmerror: always try to resume device

Browse Source 
When we're reloading the error-target dm table, always resume the device
even if the reload fails because (a) we shouldn't leave dm state for the
callers to clean up and (b) the caller don't clean up the state which
just leads to the scratch filesystem hanging on the suspended dm error
device.

Resume the dm device when we're cleaning up so that cleaning up the
scratch filesystem won't hang.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Eryu Guan <guaneryu@gmail.com>
Signed-off-by: Eryu Guan <guaneryu@gmail.com>
This commit is contained in:
Darrick J. Wong
2019-12-10 21:38:31 -08:00
committed by Eryu Guan
parent 0335928b8c
commit 29e2be0550
1 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/dmerror
+17 -4
View File
@@ -44,12 +44,16 @@ _dmerror_unmount()
_dmerror_cleanup()
{
$DMSETUP_PROG resume error-test > /dev/null 2>&1
$UMOUNT_PROG $SCRATCH_MNT > /dev/null 2>&1
_dmsetup_remove error-test
}
_dmerror_load_error_table()
{
local load_res=0
local resume_res=0
suspend_opt="--nolockfs"
if [ "$1" = "lockfs" ]; then
@@ -62,14 +66,20 @@ _dmerror_load_error_table()
[ $? -ne 0 ] && _fail "dmsetup suspend failed"
$DMSETUP_PROG load error-test --table "$DMERROR_TABLE"
[ $? -ne 0 ] && _fail "dmsetup failed to load error table"
load_res=$?
$DMSETUP_PROG resume error-test
[ $? -ne 0 ] && _fail "dmsetup resume failed"
resume_res=$?
[ $load_res -ne 0 ] && _fail "dmsetup failed to load error table"
[ $resume_res -ne 0 ] && _fail "dmsetup resume failed"
}
_dmerror_load_working_table()
{
local load_res=0
local resume_res=0
suspend_opt="--nolockfs"
if [ "$1" = "lockfs" ]; then
@@ -82,8 +92,11 @@ _dmerror_load_working_table()
[ $? -ne 0 ] && _fail "dmsetup suspend failed"
$DMSETUP_PROG load error-test --table "$DMLINEAR_TABLE"
[ $? -ne 0 ] && _fail "dmsetup failed to load error table"
load_res=$?
$DMSETUP_PROG resume error-test
[ $? -ne 0 ] && _fail "dmsetup resume failed"
resume_res=$?
[ $load_res -ne 0 ] && _fail "dmsetup failed to load error table"
[ $resume_res -ne 0 ] && _fail "dmsetup resume failed"
}