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

mount: mount.PID(), mount.Self(): change signature to return pointers

Browse Source 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2020-09-22 12:24:53 +02:00
parent fb464b94d3
commit 43578a9d6e
No known key found for this signature in database
GPG Key ID: 76698F39D527CE8C
4 changed files with 9 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mount/mountinfo.go
View File

@ -21,11 +21,3 @@ import "github.com/moby/sys/mountinfo"
// Info reveals information about a particular mounted filesystem. This // Info reveals information about a particular mounted filesystem. This
// struct is populated from the content in the /proc/<pid>/mountinfo file. // struct is populated from the content in the /proc/<pid>/mountinfo file.
type Info = mountinfo.Info type Info = mountinfo.Info
func fromMountinfoSlice(infos []*mountinfo.Info) []Info {
out := make([]Info, len(infos))
for i, v := range infos {
out[i] = *v
}
return out
}

7
mount/mountinfo_bsd.go
View File

@ -26,12 +26,11 @@ import (
) )
// Self retrieves a list of mounts for the current running process. // Self retrieves a list of mounts for the current running process.
func Self() ([]Info, error) { func Self() ([]*Info, error) {
m, err := mountinfo.GetMounts(nil) return mountinfo.GetMounts(nil)
return fromMountinfoSlice(m), err
} }
// PID collects the mounts for a specific process ID. // PID collects the mounts for a specific process ID.
func PID(pid int) ([]Info, error) { func PID(pid int) ([]*Info, error) {
return nil, fmt.Errorf("mountinfo.PID is not implemented on %s/%s", runtime.GOOS, runtime.GOARCH) return nil, fmt.Errorf("mountinfo.PID is not implemented on %s/%s", runtime.GOOS, runtime.GOARCH)
} }

10
mount/mountinfo_linux.go
View File

@ -23,15 +23,13 @@ import (
) )
// Self retrieves a list of mounts for the current running process. // Self retrieves a list of mounts for the current running process.
func Self() ([]Info, error) { func Self() ([]*Info, error) {
m, err := mountinfo.GetMounts(nil) return mountinfo.GetMounts(nil)
return fromMountinfoSlice(m), err
} }
// PID collects the mounts for a specific process ID. If the process // PID collects the mounts for a specific process ID. If the process
// ID is unknown, it is better to use `Self` which will inspect // ID is unknown, it is better to use `Self` which will inspect
// "/proc/self/mountinfo" instead. // "/proc/self/mountinfo" instead.
func PID(pid int) ([]Info, error) { func PID(pid int) ([]*Info, error) {
m, err := mountinfo.PidMountInfo(pid) return mountinfo.PidMountInfo(pid)
return fromMountinfoSlice(m), err
} }

4
mount/mountinfo_unsupported.go
View File

@ -24,11 +24,11 @@ import (
) )
// Self retrieves a list of mounts for the current running process. // Self retrieves a list of mounts for the current running process.
func Self() ([]Info, error) { func Self() ([]*Info, error) {
return nil, fmt.Errorf("mountinfo.Self is not implemented on %s/%s", runtime.GOOS, runtime.GOARCH) return nil, fmt.Errorf("mountinfo.Self is not implemented on %s/%s", runtime.GOOS, runtime.GOARCH)
} }
// PID collects the mounts for a specific process ID. // PID collects the mounts for a specific process ID.
func PID(pid int) ([]Info, error) { func PID(pid int) ([]*Info, error) {
return nil, fmt.Errorf("mountinfo.PID is not implemented on %s/%s", runtime.GOOS, runtime.GOARCH) return nil, fmt.Errorf("mountinfo.PID is not implemented on %s/%s", runtime.GOOS, runtime.GOARCH)
} }