github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

mount: extract FUSE unmounting to a function

Browse Source 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2020-09-28 13:50:29 +02:00
parent 5b13dcc73a
commit 48f64a18be
No known key found for this signature in database
GPG Key ID: 76698F39D527CE8C
1 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
mount/mount_linux.go
View File

@ -106,9 +106,10 @@ func Unmount(target string, flags int) error {
return nil return nil
} }
func isFUSE(dir string) bool {
// fuseSuperMagic is defined in statfs(2) // fuseSuperMagic is defined in statfs(2)
const fuseSuperMagic = 0x65735546 const fuseSuperMagic = 0x65735546
func isFUSE(dir string) bool {
var st unix.Statfs_t var st unix.Statfs_t
if err := unix.Statfs(dir, &st); err != nil { if err := unix.Statfs(dir, &st); err != nil {
return false return false
@ -116,16 +117,26 @@ func isFUSE(dir string) bool {
return st.Type == fuseSuperMagic return st.Type == fuseSuperMagic
} }
func unmount(target string, flags int) error { // unmountFUSE attempts to unmount using fusermount/fusermount3 helper binary.
// For FUSE mounts, attempting to execute fusermount helper binary is preferred //
// For FUSE mounts, using these helper binaries is preferred, see:
// https://github.com/containerd/containerd/pull/3765#discussion_r342083514 // https://github.com/containerd/containerd/pull/3765#discussion_r342083514
if isFUSE(target) { func unmountFUSE(target string) error {
var err error
for _, helperBinary := range []string{"fusermount3", "fusermount"} { for _, helperBinary := range []string{"fusermount3", "fusermount"} {
cmd := exec.Command(helperBinary, "-u", target) cmd := exec.Command(helperBinary, "-u", target)
if err := cmd.Run(); err == nil { err = cmd.Run()
if err == nil {
return nil return nil
} }
// ignore error and try unix.Unmount }
return err
}
func unmount(target string, flags int) error {
if isFUSE(target) {
if err := unmountFUSE(target); err == nil {
return nil
} }
} }
for i := 0; i < 50; i++ { for i := 0; i < 50; i++ {