Revert "Merge pull request 101888 from kolyshkin/update-runc-rc94"

This reverts commit b1b06fe0a4, reversing
changes made to 382a33986b.

vendor/github.com/moby/sys/mountinfo/mountinfo.go

@@ -29,38 +29,35 @@ type Info struct {
 	// ID is a unique identifier of the mount (may be reused after umount).
 	ID int
 
-	// Parent is the ID of the parent mount (or of self for the root
-	// of this mount namespace's mount tree).
+	// Parent indicates the ID of the mount parent (or of self for the top of the
+	// mount tree).
 	Parent int
 
-	// Major and Minor are the major and the minor components of the Dev
-	// field of unix.Stat_t structure returned by unix.*Stat calls for
-	// files on this filesystem.
-	Major, Minor int
+	// Major indicates one half of the device ID which identifies the device class.
+	Major int
 
-	// Root is the pathname of the directory in the filesystem which forms
-	// the root of this mount.
+	// Minor indicates one half of the device ID which identifies a specific
+	// instance of device.
+	Minor int
+
+	// Root of the mount within the filesystem.
 	Root string
 
-	// Mountpoint is the pathname of the mount point relative to the
-	// process's root directory.
+	// Mountpoint indicates the mount point relative to the process's root.
 	Mountpoint string
 
-	// Options is a comma-separated list of mount options.
+	// Options represents mount-specific options.
 	Options string
 
-	// Optional are zero or more fields of the form "tag[:value]",
-	// separated by a space.  Currently, the possible optional fields are
-	// "shared", "master", "propagate_from", and "unbindable". For more
-	// information, see mount_namespaces(7) Linux man page.
+	// Optional represents optional fields.
 	Optional string
 
-	// FSType is the filesystem type in the form "type[.subtype]".
+	// FSType indicates the type of filesystem, such as EXT3.
 	FSType string
 
-	// Source is filesystem-specific information, or "none".
+	// Source indicates filesystem specific information or "none".
 	Source string
 
-	// VFSOptions is a comma-separated list of superblock options.
+	// VFSOptions represents per super block options.
 	VFSOptions string
 }

vendor/github.com/moby/sys/mountinfo/mountinfo_filters.go

@@ -14,16 +14,11 @@ import "strings"
 // stop: true if parsing should be stopped after the entry.
 type FilterFunc func(*Info) (skip, stop bool)
 
-// PrefixFilter discards all entries whose mount points do not start with, or
-// are equal to the path specified in prefix. The prefix path must be absolute,
-// have all symlinks resolved, and cleaned (i.e. no extra slashes or dots).
-//
-// PrefixFilter treats prefix as a path, not a partial prefix, which means that
-// given "/foo", "/foo/bar" and "/foobar" entries, PrefixFilter("/foo") returns
-// "/foo" and "/foo/bar", and discards "/foobar".
+// PrefixFilter discards all entries whose mount points
+// do not start with a specific prefix.
 func PrefixFilter(prefix string) FilterFunc {
 	return func(m *Info) (bool, bool) {
-		skip := !strings.HasPrefix(m.Mountpoint+"/", prefix+"/")
+		skip := !strings.HasPrefix(m.Mountpoint, prefix)
 		return skip, false
 	}
 }

vendor/github.com/moby/sys/mountinfo/mountinfo_linux.go

@@ -12,8 +12,7 @@ import (
 // GetMountsFromReader retrieves a list of mounts from the
 // reader provided, with an optional filter applied (use nil
 // for no filter). This can be useful in tests or benchmarks
-// that provide fake mountinfo data, or when a source other
-// than /proc/self/mountinfo needs to be read from.
+// that provide a fake mountinfo data.
 //
 // This function is Linux-specific.
 func GetMountsFromReader(r io.Reader, filter FilterFunc) ([]*Info, error) {
@@ -134,6 +133,8 @@ func GetMountsFromReader(r io.Reader, filter FilterFunc) ([]*Info, error) {
 	return out, nil
 }
 
+// Parse /proc/self/mountinfo because comparing Dev and ino does not work from
+// bind mounts
 func parseMountTable(filter FilterFunc) ([]*Info, error) {
 	f, err := os.Open("/proc/self/mountinfo")
 	if err != nil {