Skip to contentSkip to conversation

overlay/078: Fix cleanup with unpatched kernel

PATCH New Amir Goldstein 1 participant 1 message Aug 3, 2021

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 overlay/078: Fix cleanup with unpatched kernel

Darrick wrote: "...
I noticed a massive regression with this week's fstests, probably because something didn't get cleaned up properly:
...
+rm: cannot remove '/opt/ovl-upper/testfile': Operation not permitted
...

and then the tests after it (e.g. generic/030) fail with:

+mount: /opt/ovl-mnt: mount(2) system call failed: Stale file handle. ..."

---
 tests/overlay/078 | 3 +++
 1 file changed, 3 insertions(+)
tests/overlay/078 +3 -0
index 522e2e3c..d72faf2c 100755
@@ -24,6 +24,7 @@ _cleanup()
 {
 	cd /
 	$CHATTR_PROG -ai $lowertestfile &> /dev/null
+	$CHATTR_PROG -ai $uppertestfile &> /dev/null
 	rm -f $tmp.*
 }
 
@@ -45,6 +46,7 @@ lowerdir=$OVL_BASE_SCRATCH_MNT/$OVL_LOWER
 upperdir=$OVL_BASE_SCRATCH_MNT/$OVL_UPPER
 workdir=$OVL_BASE_SCRATCH_MNT/$OVL_WORK
 lowertestfile=$lowerdir/testfile
+uppertestfile=$upperdir/testfile
 testfile=$SCRATCH_MNT/testfile
 
 _scratch_mkfs
@@ -66,6 +68,7 @@ do_check()
 	$CHATTR_PROG +$attr $lowertestfile
 
 	# Re-create upperdir/workdir
+	$CHATTR_PROG -ai $uppertestfile &> /dev/null
 	rm -rf $upperdir $workdir
 	mkdir -p $upperdir $workdir
 
Signature · 1 line
2.25.1