snapshots|pkg: umount without DETACH and nosync after umount

Signed-off-by: Wei Fu <[email protected]>
containerd · kzys · Jun 26, 2023 · Jun 15, 2023 · Jun 15, 2023 · Jun 15, 2023
commit 6dfb16f99a3bbafb31a93752c61461c77f23db9d
diff --git a/pkg/testutil/helpers.go b/pkg/testutil/helpers.go
@@ -28,6 +28,8 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
+const umountflags int = 0
+
 var rootEnabled bool
 
 func init() {

diff --git a/pkg/testutil/mount_linux.go b/pkg/testutil/mount_linux.go
diff --git a/pkg/testutil/mount_other.go b/pkg/testutil/mount_other.go
diff --git a/snapshots/btrfs/btrfs_test.go b/snapshots/btrfs/btrfs_test.go
@@ -102,7 +102,7 @@ func boltSnapshotter(t *testing.T) func(context.Context, string) (snapshots.Snap
 			if err := snapshotter.Close(); err != nil {
 				return err
 			}
-			err := mount.UnmountAll(root, unix.MNT_DETACH)
+			err := mount.UnmountAll(root, 0)
 			if cerr := loop.Close(); cerr != nil {
 				err = fmt.Errorf("device cleanup failed: %w", cerr)
 			}

diff --git a/snapshots/testsuite/helpers.go b/snapshots/testsuite/helpers.go
@@ -27,6 +27,8 @@ import (
 	"github.com/containerd/continuity/fs/fstest"
 )
 
+const umountflags int = 0
+
 func applyToMounts(m []mount.Mount, work string, a fstest.Applier) (err error) {
 	td, err := os.MkdirTemp(work, "prepare")
 	if err != nil {

diff --git a/snapshots/testsuite/helpers_linux.go b/snapshots/testsuite/helpers_linux.go
diff --git a/snapshots/testsuite/helpers_other.go b/snapshots/testsuite/helpers_other.go
diff --git a/snapshots/testsuite/testsuite.go b/snapshots/testsuite/testsuite.go
@@ -959,7 +959,6 @@ func check128LayersMount(name string) func(ctx context.Context, t *testing.T, sn
 				t.Fatalf("[layer %d] preparing doesn't equal to flat after apply: %+v", i, err)
 			}
 
-			sync()
 			testutil.Unmount(t, preparing)
 
 			parent = filepath.Join(work, fmt.Sprintf("committed-%d", i))

diff --git a/snapshots/testsuite/testsuite_unix.go b/snapshots/testsuite/testsuite_unix.go
@@ -20,8 +20,6 @@ package testsuite
 
 import (
 	"syscall"
-
-	"golang.org/x/sys/unix"
 )
 
 func clearMask() func() {
@@ -30,7 +28,3 @@ func clearMask() func() {
 		syscall.Umask(oldumask)
 	}
 }
-
-func sync() {
-	unix.Sync()
-}
diff --git a/snapshots/testsuite/testsuite_windows.go b/snapshots/testsuite/testsuite_windows.go
@@ -19,5 +19,3 @@ package testsuite
 func clearMask() func() {
 	return func() {}
 }
-
-func sync() {}
-Original file line number
+Diff line change
@@ Expand Up @@
     				t.Fatalf("[layer %d] preparing doesn't equal to flat after apply: %+v", i, err)
     			}
-    			sync()
     			testutil.Unmount(t, preparing)
     			parent = filepath.Join(work, fmt.Sprintf("committed-%d", i))
@@ Expand Down @@