mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
![Sebastiaan van Stijn](/assets/img/avatar_default.png)
full diff: https://github.com/moby/sys/compare/mountinfo/v0.1.3...mountinfo/v0.4.0 > Note that this dependency uses submodules, providing "github.com/moby/sys/mount" > and "github.com/moby/sys/mountinfo". Our vendoring tool (vndr) currently doesn't > support submodules, so we vendor the top-level moby/sys repository (which contains > both) and pick the most recent tag, which could be either `mountinfo/vXXX` or > `mount/vXXX`. github.com/moby/sys/mountinfo v0.4.0 -------------------------------------------------------------------------------- Breaking changes: - `PidMountInfo` is now deprecated and will be removed before v1.0; users should switch to `GetMountsFromReader` Fixes and improvements: - run filter after all fields are parsed - correct handling errors from bufio.Scan - documentation formatting fixes github.com/moby/sys/mountinfo v0.3.1 -------------------------------------------------------------------------------- - mount: use MNT_* flags from golang.org/x/sys/unix on freebsd - various godoc and CI fixes - mountinfo: make GetMountinfoFromReader Linux-specific - Add support for OpenBSD in addition to FreeBSD - mountinfo: use idiomatic naming for fields github.com/moby/sys/mountinfo v0.2.0 -------------------------------------------------------------------------------- Bug fixes: - Fix path unescaping for paths with double quotes Improvements: - Mounted: speed up by adding fast paths using openat2 (Linux-only) and stat - Mounted: relax path requirements (allow relative, non-cleaned paths, symlinks) - Unescape fstype and source fields - Documentation improvements Testing/CI: - Unit tests: exclude darwin - CI: run tests under Fedora 32 to test openat2 - TestGetMounts: fix for Ubuntu build system - Makefile: fix ignoring test failures - CI: add cross build github.com/moby/sys/mount v0.1.1 -------------------------------------------------------------------------------- https://github.com/moby/sys/releases/tag/mount%2Fv0.1.1 Improvements: - RecursiveUnmount: add a fast path (#26) - Unmount: improve doc - fix CI linter warning on Windows Testing/CI: - Unit tests: exclude darwin - Makefile: fix ignoring test failures - CI: add cross build Signed-off-by: Sebastiaan van Stijn <github@gone.nl> Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
58 lines
1.5 KiB
Go
58 lines
1.5 KiB
Go
package mountinfo
|
|
|
|
import (
|
|
"os"
|
|
"path/filepath"
|
|
|
|
"golang.org/x/sys/unix"
|
|
)
|
|
|
|
// mountedByOpenat2 is a method of detecting a mount that works for all kinds
|
|
// of mounts (incl. bind mounts), but requires a recent (v5.6+) linux kernel.
|
|
func mountedByOpenat2(path string) (bool, error) {
|
|
dir, last := filepath.Split(path)
|
|
|
|
dirfd, err := unix.Openat2(unix.AT_FDCWD, dir, &unix.OpenHow{
|
|
Flags: unix.O_PATH | unix.O_CLOEXEC,
|
|
})
|
|
if err != nil {
|
|
if err == unix.ENOENT { // not a mount
|
|
return false, nil
|
|
}
|
|
return false, &os.PathError{Op: "openat2", Path: dir, Err: err}
|
|
}
|
|
fd, err := unix.Openat2(dirfd, last, &unix.OpenHow{
|
|
Flags: unix.O_PATH | unix.O_CLOEXEC | unix.O_NOFOLLOW,
|
|
Resolve: unix.RESOLVE_NO_XDEV,
|
|
})
|
|
_ = unix.Close(dirfd)
|
|
switch err {
|
|
case nil: // definitely not a mount
|
|
_ = unix.Close(fd)
|
|
return false, nil
|
|
case unix.EXDEV: // definitely a mount
|
|
return true, nil
|
|
case unix.ENOENT: // not a mount
|
|
return false, nil
|
|
}
|
|
// not sure
|
|
return false, &os.PathError{Op: "openat2", Path: path, Err: err}
|
|
}
|
|
|
|
func mounted(path string) (bool, error) {
|
|
// Try a fast path, using openat2() with RESOLVE_NO_XDEV.
|
|
mounted, err := mountedByOpenat2(path)
|
|
if err == nil {
|
|
return mounted, nil
|
|
}
|
|
// Another fast path: compare st.st_dev fields.
|
|
mounted, err = mountedByStat(path)
|
|
// This does not work for bind mounts, so false negative
|
|
// is possible, therefore only trust if return is true.
|
|
if mounted && err == nil {
|
|
return mounted, nil
|
|
}
|
|
|
|
// Fallback to parsing mountinfo
|
|
return mountedByMountinfo(path)
|
|
}
|