@@ -74,18 +74,22 @@ func (daemon *Daemon) cleanupMounts() error {

 		return err

 	}

-	infos, err := mount.GetMounts()

+	info, err := mount.GetMounts(mount.SingleEntryFilter(daemon.root))

 	if err != nil {

 		return errors.Wrap(err, "error reading mount table for cleanup")

 	}

-	info := getMountInfo(infos, daemon.root)

+	if len(info) < 1 {

+		// no mount found, we're done here

+		return nil

+	}

+

 	// `info.Root` here is the root mountpoint of the passed in path (`daemon.root`).

 	// The ony cases that need to be cleaned up is when the daemon has performed a

 	//   `mount --bind /daemon/root /daemon/root && mount --make-shared /daemon/root`

 	// This is only done when the daemon is started up and `/daemon/root` is not

 	// already on a shared mountpoint.

-	if !shouldUnmountRoot(daemon.root, info) {

+	if !shouldUnmountRoot(daemon.root, info[0]) {

 		return nil

 	}

@@ -122,12 +126,6 @@ func getRealPath(path string) (string, error) {

 }

 func shouldUnmountRoot(root string, info *mount.Info) bool {

-	if info == nil {

-		return false

-	}

-	if info.Mountpoint != root {

-		return false

-	}

 	if !strings.HasSuffix(root, info.Root) {

 		return false

 	}

@@ -184,12 +184,6 @@ func TestShouldUnmountRoot(t *testing.T) {

 			expect: true,

 		},

 		{

-			desc:   "not a mountpoint",

-			root:   "/docker",

-			info:   nil,

-			expect: false,

-		},

-		{

 			desc:   "root is at in a submount from `/`",

 			root:   "/foo/docker",

 			info:   &mount.Info{Root: "/docker", Mountpoint: "/foo/docker"},

@@ -201,12 +195,6 @@ func TestShouldUnmountRoot(t *testing.T) {

 			info:   &mount.Info{Root: "/docker/volumes/1234657/_data", Mountpoint: "/docker"},

 			expect: false,

 		},

-		{

-			desc:   "root is mounted in from a parent mount namespace different root dir",

-			root:   "/foo/bar",

-			info:   &mount.Info{Root: "/docker/volumes/1234657/_data", Mountpoint: "/foo/bar"},

-			expect: false,

-		},

 	} {

 		t.Run(test.desc, func(t *testing.T) {

 			for _, options := range []struct {

@@ -147,7 +147,7 @@ func lookupZfsDataset(rootdir string) (string, error) {

 	}

 	wantedDev := stat.Dev

-	mounts, err := mount.GetMounts()

+	mounts, err := mount.GetMounts(nil)

 	if err != nil {

 		return "", err

 	}

@@ -380,15 +380,6 @@ func specMapping(s []idtools.IDMap) []specs.LinuxIDMapping {

 	return ids

 }

-func getMountInfo(mountinfo []*mount.Info, dir string) *mount.Info {

-	for _, m := range mountinfo {

-		if m.Mountpoint == dir {

-			return m

-		}

-	}

-	return nil

-}

-

 // Get the source mount point of directory passed in as argument. Also return

 // optional fields.

 func getSourceMount(source string) (string, string, error) {

@@ -398,29 +389,26 @@ func getSourceMount(source string) (string, string, error) {

 		return "", "", err

 	}

-	mountinfos, err := mount.GetMounts()

+	mi, err := mount.GetMounts(mount.ParentsFilter(sourcePath))

 	if err != nil {

 		return "", "", err

 	}

-

-	mountinfo := getMountInfo(mountinfos, sourcePath)

-	if mountinfo != nil {

-		return sourcePath, mountinfo.Optional, nil

+	if len(mi) < 1 {

+		return "", "", fmt.Errorf("Can't find mount point of %s", source)

 	}

-	path := sourcePath

-	for {

-		path = filepath.Dir(path)

-

-		mountinfo = getMountInfo(mountinfos, path)

-		if mountinfo != nil {

-			return path, mountinfo.Optional, nil

-		}

-

-		if path == "/" {

-			break

+	// find the longest mount point

+	var idx, maxlen int

+	for i := range mi {

+		if len(mi[i].Mountpoint) > maxlen {

+			maxlen = len(mi[i].Mountpoint)

+			idx = i

 		}

 	}

+	// and return it unless it's "/"

+	if mi[idx].Mountpoint != "/" {

+		return mi[idx].Mountpoint, mi[idx].Optional, nil

+	}

 	// If we are here, we did not find parent mount. Something is wrong.

 	return "", "", fmt.Errorf("Could not find source mount of %s", source)

@@ -260,7 +260,7 @@ func (s *DockerDaemonSuite) TestPluginVolumeRemoveOnRestart(c *check.C) {

 }

 func existsMountpointWithPrefix(mountpointPrefix string) (bool, error) {

-	mounts, err := mount.GetMounts()

+	mounts, err := mount.GetMounts(nil)

 	if err != nil {

 		return false, err

 	}

@@ -3,32 +3,64 @@ package mount // import "github.com/docker/docker/pkg/mount"

 import (

 	"sort"

 	"strings"

-

 	"syscall"

 	"github.com/sirupsen/logrus"

 )

-// GetMounts retrieves a list of mounts for the current running process.

-func GetMounts() ([]*Info, error) {

-	return parseMountTable()

+// FilterFunc is a type defining a callback function

+// to filter out unwanted entries. It takes a pointer

+// to an Info struct (not fully populated, currently

+// only Mountpoint is filled in), and returns two booleans:

+//  - skip: true if the entry should be skipped

+//  - 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 a prefix specified

+func PrefixFilter(prefix string) FilterFunc {

+	return func(m *Info) (bool, bool) {

+		skip := !strings.HasPrefix(m.Mountpoint, prefix)

+		return skip, false

+	}

+}

+

+// SingleEntryFilter looks for a specific entry

+func SingleEntryFilter(mp string) FilterFunc {

+	return func(m *Info) (bool, bool) {

+		if m.Mountpoint == mp {

+			return false, true // don't skip, stop now

+		}

+		return true, false // skip, keep going

+	}

+}

+

+// ParentsFilter returns all entries whose mount points

+// can be parents of a path specified, discarding others.

+// For example, given `/var/lib/docker/something`, entries

+// like `/var/lib/docker`, `/var` and `/` are returned.

+func ParentsFilter(path string) FilterFunc {

+	return func(m *Info) (bool, bool) {

+		skip := !strings.HasPrefix(path, m.Mountpoint)

+		return skip, false

+	}

+}

+

+// GetMounts retrieves a list of mounts for the current running process,

+// with an optional filter applied (use nil for no filter).

+func GetMounts(f FilterFunc) ([]*Info, error) {

+	return parseMountTable(f)

 }

 // Mounted determines if a specified mountpoint has been mounted.

 // On Linux it looks at /proc/self/mountinfo.

 func Mounted(mountpoint string) (bool, error) {

-	entries, err := parseMountTable()

+	entries, err := GetMounts(SingleEntryFilter(mountpoint))

 	if err != nil {

 		return false, err

 	}

-	// Search the table for the mountpoint

-	for _, e := range entries {

-		if e.Mountpoint == mountpoint {

-			return true, nil

-		}

-	}

-	return false, nil

+	return len(entries) > 0, nil

 }

 // Mount will mount filesystem according to the specified configuration, on the

@@ -57,16 +89,18 @@ func ForceMount(device, target, mType, options string) error {

 // Unmount lazily unmounts a filesystem on supported platforms, otherwise

 // does a normal unmount.

 func Unmount(target string) error {

-	if mounted, err := Mounted(target); err != nil || !mounted {

-		return err

+	err := unmount(target, mntDetach)

+	if err == syscall.EINVAL {

+		// ignore "not mounted" error

+		err = nil

 	}

-	return unmount(target, mntDetach)

+	return err

 }

 // RecursiveUnmount unmounts the target and all mounts underneath, starting with

 // the deepsest mount first.

 func RecursiveUnmount(target string) error {

-	mounts, err := GetMounts()

+	mounts, err := parseMountTable(PrefixFilter(target))

 	if err != nil {

 		return err

 	}

@@ -77,9 +111,6 @@ func RecursiveUnmount(target string) error {

 	})

 	for i, m := range mounts {

-		if !strings.HasPrefix(m.Mountpoint, target) {

-			continue

-		}

 		logrus.Debugf("Trying to unmount %s", m.Mountpoint)

 		err = unmount(m.Mountpoint, mntDetach)

 		if err != nil {

@@ -129,7 +129,7 @@ func TestMountReadonly(t *testing.T) {

 }

 func TestGetMounts(t *testing.T) {

-	mounts, err := GetMounts()

+	mounts, err := GetMounts(nil)

 	if err != nil {

 		t.Fatal(err)

 	}

@@ -121,7 +121,7 @@ func ensureUnmount(t *testing.T, mnt string) {

 // validateMount checks that mnt has the given options

 func validateMount(t *testing.T, mnt string, opts, optional, vfs string) {

-	info, err := GetMounts()

+	info, err := GetMounts(nil)

 	if err != nil {

 		t.Fatal(err)

 	}

@@ -15,7 +15,7 @@ import (

 // Parse /proc/self/mountinfo because comparing Dev and ino does not work from

 // bind mounts.

-func parseMountTable() ([]*Info, error) {

+func parseMountTable(filter FilterFunc) ([]*Info, error) {

 	var rawEntries *C.struct_statfs

 	count := int(C.getmntinfo(&rawEntries, C.MNT_WAIT))

@@ -32,10 +32,24 @@ func parseMountTable() ([]*Info, error) {

 	var out []*Info

 	for _, entry := range entries {

 		var mountinfo Info

+		var skip, stop bool

 		mountinfo.Mountpoint = C.GoString(&entry.f_mntonname[0])

+

+		if filter != nil {

+			// filter out entries we're not interested in

+			skip, stop = filter(p)

+			if skip {

+				continue

+			}

+		}

+

 		mountinfo.Source = C.GoString(&entry.f_mntfromname[0])

 		mountinfo.Fstype = C.GoString(&entry.f_fstypename[0])

+

 		out = append(out, &mountinfo)

+		if stop {

+			break

+		}

 	}

 	return out, nil

 }

@@ -5,80 +5,119 @@ import (

 	"fmt"

 	"io"

 	"os"

+	"strconv"

 	"strings"

 )

-const (

-	/* 36 35 98:0 /mnt1 /mnt2 rw,noatime master:1 - ext3 /dev/root rw,errors=continue

-	   (1)(2)(3)   (4)   (5)      (6)      (7)   (8) (9)   (10)         (11)

+func parseInfoFile(r io.Reader, filter FilterFunc) ([]*Info, error) {

+	s := bufio.NewScanner(r)

+	out := []*Info{}

+	for s.Scan() {

+		if err := s.Err(); err != nil {

+			return nil, err

+		}

+		/*

+		   36 35 98:0 /mnt1 /mnt2 rw,noatime master:1 - ext3 /dev/root rw,errors=continue

+		   (1)(2)(3)   (4)   (5)      (6)      (7)   (8) (9)   (10)         (11)

-	   (1) mount ID:  unique identifier of the mount (may be reused after umount)

-	   (2) parent ID:  ID of parent (or of self for the top of the mount tree)

-	   (3) major:minor:  value of st_dev for files on filesystem

-	   (4) root:  root of the mount within the filesystem

-	   (5) mount point:  mount point relative to the process's root

-	   (6) mount options:  per mount options

-	   (7) optional fields:  zero or more fields of the form "tag[:value]"

-	   (8) separator:  marks the end of the optional fields

-	   (9) filesystem type:  name of filesystem of the form "type[.subtype]"

-	   (10) mount source:  filesystem specific information or "none"

-	   (11) super options:  per super block options*/

-	mountinfoFormat = "%d %d %d:%d %s %s %s %s"

-)

+		   (1) mount ID:  unique identifier of the mount (may be reused after umount)

+		   (2) parent ID:  ID of parent (or of self for the top of the mount tree)

+		   (3) major:minor:  value of st_dev for files on filesystem

+		   (4) root:  root of the mount within the filesystem

+		   (5) mount point:  mount point relative to the process's root

+		   (6) mount options:  per mount options

+		   (7) optional fields:  zero or more fields of the form "tag[:value]"

+		   (8) separator:  marks the end of the optional fields

+		   (9) filesystem type:  name of filesystem of the form "type[.subtype]"

+		   (10) mount source:  filesystem specific information or "none"

+		   (11) super options:  per super block options

+		*/

-// Parse /proc/self/mountinfo because comparing Dev and ino does not work from

-// bind mounts

-func parseMountTable() ([]*Info, error) {

-	f, err := os.Open("/proc/self/mountinfo")

-	if err != nil {

-		return nil, err

-	}

-	defer f.Close()

+		text := s.Text()

+		fields := strings.Split(text, " ")

+		numFields := len(fields)

+		if numFields < 10 {

+			// should be at least 10 fields

+			return nil, fmt.Errorf("Parsing '%s' failed: not enough fields (%d)", text, numFields)

+		}

-	return parseInfoFile(f)

-}

+		p := &Info{}

+		// ignore any numbers parsing errors, as there should not be any

+		p.ID, _ = strconv.Atoi(fields[0])

+		p.Parent, _ = strconv.Atoi(fields[1])

+		mm := strings.Split(fields[2], ":")

+		if len(mm) != 2 {

+			return nil, fmt.Errorf("Parsing '%s' failed: unexpected minor:major pair %s", text, mm)

+		}

+		p.Major, _ = strconv.Atoi(mm[0])

+		p.Minor, _ = strconv.Atoi(mm[1])

-func parseInfoFile(r io.Reader) ([]*Info, error) {

-	var (

-		s   = bufio.NewScanner(r)

-		out = []*Info{}

-	)

+		p.Root = fields[3]

+		p.Mountpoint = fields[4]

+		p.Opts = fields[5]

-	for s.Scan() {

-		if err := s.Err(); err != nil {

-			return nil, err

+		var skip, stop bool

+		if filter != nil {

+			// filter out entries we're not interested in

+			skip, stop = filter(p)

+			if skip {

+				continue

+			}

 		}

-		var (

-			p              = &Info{}

-			text           = s.Text()

-			optionalFields string

-		)

-

-		if _, err := fmt.Sscanf(text, mountinfoFormat,

-			&p.ID, &p.Parent, &p.Major, &p.Minor,

-			&p.Root, &p.Mountpoint, &p.Opts, &optionalFields); err != nil {

-			return nil, fmt.Errorf("Scanning '%s' failed: %s", text, err)

+		// one or more optional fields, when a separator (-)

+		i := 6

+		for ; i < numFields && fields[i] != "-"; i++ {

+			switch i {

+			case 6:

+				p.Optional = fields[6]

+			default:

+				/* NOTE there might be more optional fields before the such as

+				   fields[7]...fields[N] (where N < sepIndex), although

+				   as of Linux kernel 4.15 the only known ones are

+				   mount propagation flags in fields[6]. The correct

+				   behavior is to ignore any unknown optional fields.

+				*/

+				break

+			}

 		}

-		// Safe as mountinfo encodes mountpoints with spaces as \040.

-		index := strings.Index(text, " - ")

-		postSeparatorFields := strings.Fields(text[index+3:])

-		if len(postSeparatorFields) < 3 {

-			return nil, fmt.Errorf("Error found less than 3 fields post '-' in %q", text)

+		if i == numFields {

+			return nil, fmt.Errorf("Parsing '%s' failed: missing separator ('-')", text)

 		}

-		if optionalFields != "-" {

-			p.Optional = optionalFields

+		// There should be 3 fields after the separator...

+		if i+4 > numFields {

+			return nil, fmt.Errorf("Parsing '%s' failed: not enough fields after a separator", text)

 		}

+		// ... but in Linux <= 3.9 mounting a cifs with spaces in a share name

+		// (like "//serv/My Documents") _may_ end up having a space in the last field

+		// of mountinfo (like "unc=//serv/My Documents"). Since kernel 3.10-rc1, cifs

+		// option unc= is ignored,  so a space should not appear. In here we ignore

+		// those "extra" fields caused by extra spaces.

+		p.Fstype = fields[i+1]

+		p.Source = fields[i+2]

+		p.VfsOpts = fields[i+3]

-		p.Fstype = postSeparatorFields[0]

-		p.Source = postSeparatorFields[1]

-		p.VfsOpts = strings.Join(postSeparatorFields[2:], " ")

 		out = append(out, p)

+		if stop {

+			break

+		}

 	}

 	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 {

+		return nil, err

+	}

+	defer f.Close()

+

+	return parseInfoFile(f, filter)

+}

+

 // PidMountInfo collects the mounts for a specific process ID. If the process

 // ID is unknown, it is better to use `GetMounts` which will inspect

 // "/proc/self/mountinfo" instead.

@@ -89,5 +128,5 @@ func PidMountInfo(pid int) ([]*Info, error) {

 	}

 	defer f.Close()

-	return parseInfoFile(f)

+	return parseInfoFile(f, nil)

 }

@@ -5,67 +5,69 @@ package mount // import "github.com/docker/docker/pkg/mount"

 import (

 	"bytes"

 	"testing"

+

+	"github.com/gotestyourself/gotestyourself/assert"

 )

 const (

 	fedoraMountinfo = `15 35 0:3 / /proc rw,nosuid,nodev,noexec,relatime shared:5 - proc proc rw

-    16 35 0:14 / /sys rw,nosuid,nodev,noexec,relatime shared:6 - sysfs sysfs rw,seclabel

-    17 35 0:5 / /dev rw,nosuid shared:2 - devtmpfs devtmpfs rw,seclabel,size=8056484k,nr_inodes=2014121,mode=755

-    18 16 0:15 / /sys/kernel/security rw,nosuid,nodev,noexec,relatime shared:7 - securityfs securityfs rw

-    19 16 0:13 / /sys/fs/selinux rw,relatime shared:8 - selinuxfs selinuxfs rw

-    20 17 0:16 / /dev/shm rw,nosuid,nodev shared:3 - tmpfs tmpfs rw,seclabel

-    21 17 0:10 / /dev/pts rw,nosuid,noexec,relatime shared:4 - devpts devpts rw,seclabel,gid=5,mode=620,ptmxmode=000

-    22 35 0:17 / /run rw,nosuid,nodev shared:21 - tmpfs tmpfs rw,seclabel,mode=755

-    23 16 0:18 / /sys/fs/cgroup rw,nosuid,nodev,noexec shared:9 - tmpfs tmpfs rw,seclabel,mode=755

-    24 23 0:19 / /sys/fs/cgroup/systemd rw,nosuid,nodev,noexec,relatime shared:10 - cgroup cgroup rw,xattr,release_agent=/usr/lib/systemd/systemd-cgroups-agent,name=systemd

-    25 16 0:20 / /sys/fs/pstore rw,nosuid,nodev,noexec,relatime shared:20 - pstore pstore rw

-    26 23 0:21 / /sys/fs/cgroup/cpuset rw,nosuid,nodev,noexec,relatime shared:11 - cgroup cgroup rw,cpuset,clone_children

-    27 23 0:22 / /sys/fs/cgroup/cpu,cpuacct rw,nosuid,nodev,noexec,relatime shared:12 - cgroup cgroup rw,cpuacct,cpu,clone_children

-    28 23 0:23 / /sys/fs/cgroup/memory rw,nosuid,nodev,noexec,relatime shared:13 - cgroup cgroup rw,memory,clone_children

-    29 23 0:24 / /sys/fs/cgroup/devices rw,nosuid,nodev,noexec,relatime shared:14 - cgroup cgroup rw,devices,clone_children

-    30 23 0:25 / /sys/fs/cgroup/freezer rw,nosuid,nodev,noexec,relatime shared:15 - cgroup cgroup rw,freezer,clone_children

-    31 23 0:26 / /sys/fs/cgroup/net_cls rw,nosuid,nodev,noexec,relatime shared:16 - cgroup cgroup rw,net_cls,clone_children

-    32 23 0:27 / /sys/fs/cgroup/blkio rw,nosuid,nodev,noexec,relatime shared:17 - cgroup cgroup rw,blkio,clone_children

-    33 23 0:28 / /sys/fs/cgroup/perf_event rw,nosuid,nodev,noexec,relatime shared:18 - cgroup cgroup rw,perf_event,clone_children

-    34 23 0:29 / /sys/fs/cgroup/hugetlb rw,nosuid,nodev,noexec,relatime shared:19 - cgroup cgroup rw,hugetlb,clone_children

-    35 1 253:2 / / rw,relatime shared:1 - ext4 /dev/mapper/ssd-root--f20 rw,seclabel,data=ordered

-    36 15 0:30 / /proc/sys/fs/binfmt_misc rw,relatime shared:22 - autofs systemd-1 rw,fd=38,pgrp=1,timeout=300,minproto=5,maxproto=5,direct

-    37 17 0:12 / /dev/mqueue rw,relatime shared:23 - mqueue mqueue rw,seclabel

-    38 35 0:31 / /tmp rw shared:24 - tmpfs tmpfs rw,seclabel

-    39 17 0:32 / /dev/hugepages rw,relatime shared:25 - hugetlbfs hugetlbfs rw,seclabel

-    40 16 0:7 / /sys/kernel/debug rw,relatime shared:26 - debugfs debugfs rw

-    41 16 0:33 / /sys/kernel/config rw,relatime shared:27 - configfs configfs rw

-    42 35 0:34 / /var/lib/nfs/rpc_pipefs rw,relatime shared:28 - rpc_pipefs sunrpc rw

-    43 15 0:35 / /proc/fs/nfsd rw,relatime shared:29 - nfsd sunrpc rw

-    45 35 8:17 / /boot rw,relatime shared:30 - ext4 /dev/sdb1 rw,seclabel,data=ordered

-    46 35 253:4 / /home rw,relatime shared:31 - ext4 /dev/mapper/ssd-home rw,seclabel,data=ordered

-    47 35 253:5 / /var/lib/libvirt/images rw,noatime,nodiratime shared:32 - ext4 /dev/mapper/ssd-virt rw,seclabel,discard,data=ordered

-    48 35 253:12 / /mnt/old rw,relatime shared:33 - ext4 /dev/mapper/HelpDeskRHEL6-FedoraRoot rw,seclabel,data=ordered

-    121 22 0:36 / /run/user/1000/gvfs rw,nosuid,nodev,relatime shared:104 - fuse.gvfsd-fuse gvfsd-fuse rw,user_id=1000,group_id=1000

-    124 16 0:37 / /sys/fs/fuse/connections rw,relatime shared:107 - fusectl fusectl rw

-    165 38 253:3 / /tmp/mnt rw,relatime shared:147 - ext4 /dev/mapper/ssd-root rw,seclabel,data=ordered

-    167 35 253:15 / /var/lib/docker/devicemapper/mnt/aae4076022f0e2b80a2afbf8fc6df450c52080191fcef7fb679a73e6f073e5c2 rw,relatime shared:149 - ext4 /dev/mapper/docker-253:2-425882-aae4076022f0e2b80a2afbf8fc6df450c52080191fcef7fb679a73e6f073e5c2 rw,seclabel,discard,stripe=16,data=ordered

-    171 35 253:16 / /var/lib/docker/devicemapper/mnt/c71be651f114db95180e472f7871b74fa597ee70a58ccc35cb87139ddea15373 rw,relatime shared:153 - ext4 /dev/mapper/docker-253:2-425882-c71be651f114db95180e472f7871b74fa597ee70a58ccc35cb87139ddea15373 rw,seclabel,discard,stripe=16,data=ordered

-    175 35 253:17 / /var/lib/docker/devicemapper/mnt/1bac6ab72862d2d5626560df6197cf12036b82e258c53d981fa29adce6f06c3c rw,relatime shared:157 - ext4 /dev/mapper/docker-253:2-425882-1bac6ab72862d2d5626560df6197cf12036b82e258c53d981fa29adce6f06c3c rw,seclabel,discard,stripe=16,data=ordered

-    179 35 253:18 / /var/lib/docker/devicemapper/mnt/d710a357d77158e80d5b2c55710ae07c94e76d34d21ee7bae65ce5418f739b09 rw,relatime shared:161 - ext4 /dev/mapper/docker-253:2-425882-d710a357d77158e80d5b2c55710ae07c94e76d34d21ee7bae65ce5418f739b09 rw,seclabel,discard,stripe=16,data=ordered

-    183 35 253:19 / /var/lib/docker/devicemapper/mnt/6479f52366114d5f518db6837254baab48fab39f2ac38d5099250e9a6ceae6c7 rw,relatime shared:165 - ext4 /dev/mapper/docker-253:2-425882-6479f52366114d5f518db6837254baab48fab39f2ac38d5099250e9a6ceae6c7 rw,seclabel,discard,stripe=16,data=ordered

-    187 35 253:20 / /var/lib/docker/devicemapper/mnt/8d9df91c4cca5aef49eeb2725292aab324646f723a7feab56be34c2ad08268e1 rw,relatime shared:169 - ext4 /dev/mapper/docker-253:2-425882-8d9df91c4cca5aef49eeb2725292aab324646f723a7feab56be34c2ad08268e1 rw,seclabel,discard,stripe=16,data=ordered

-    191 35 253:21 / /var/lib/docker/devicemapper/mnt/c8240b768603d32e920d365dc9d1dc2a6af46cd23e7ae819947f969e1b4ec661 rw,relatime shared:173 - ext4 /dev/mapper/docker-253:2-425882-c8240b768603d32e920d365dc9d1dc2a6af46cd23e7ae819947f969e1b4ec661 rw,seclabel,discard,stripe=16,data=ordered

-    195 35 253:22 / /var/lib/docker/devicemapper/mnt/2eb3a01278380bbf3ed12d86ac629eaa70a4351301ee307a5cabe7b5f3b1615f rw,relatime shared:177 - ext4 /dev/mapper/docker-253:2-425882-2eb3a01278380bbf3ed12d86ac629eaa70a4351301ee307a5cabe7b5f3b1615f rw,seclabel,discard,stripe=16,data=ordered

-    199 35 253:23 / /var/lib/docker/devicemapper/mnt/37a17fb7c9d9b80821235d5f2662879bd3483915f245f9b49cdaa0e38779b70b rw,relatime shared:181 - ext4 /dev/mapper/docker-253:2-425882-37a17fb7c9d9b80821235d5f2662879bd3483915f245f9b49cdaa0e38779b70b rw,seclabel,discard,stripe=16,data=ordered

-    203 35 253:24 / /var/lib/docker/devicemapper/mnt/aea459ae930bf1de913e2f29428fd80ee678a1e962d4080019d9f9774331ee2b rw,relatime shared:185 - ext4 /dev/mapper/docker-253:2-425882-aea459ae930bf1de913e2f29428fd80ee678a1e962d4080019d9f9774331ee2b rw,seclabel,discard,stripe=16,data=ordered

-    207 35 253:25 / /var/lib/docker/devicemapper/mnt/928ead0bc06c454bd9f269e8585aeae0a6bd697f46dc8754c2a91309bc810882 rw,relatime shared:189 - ext4 /dev/mapper/docker-253:2-425882-928ead0bc06c454bd9f269e8585aeae0a6bd697f46dc8754c2a91309bc810882 rw,seclabel,discard,stripe=16,data=ordered

-    211 35 253:26 / /var/lib/docker/devicemapper/mnt/0f284d18481d671644706e7a7244cbcf63d590d634cc882cb8721821929d0420 rw,relatime shared:193 - ext4 /dev/mapper/docker-253:2-425882-0f284d18481d671644706e7a7244cbcf63d590d634cc882cb8721821929d0420 rw,seclabel,discard,stripe=16,data=ordered

-    215 35 253:27 / /var/lib/docker/devicemapper/mnt/d9dd16722ab34c38db2733e23f69e8f4803ce59658250dd63e98adff95d04919 rw,relatime shared:197 - ext4 /dev/mapper/docker-253:2-425882-d9dd16722ab34c38db2733e23f69e8f4803ce59658250dd63e98adff95d04919 rw,seclabel,discard,stripe=16,data=ordered

-    219 35 253:28 / /var/lib/docker/devicemapper/mnt/bc4500479f18c2c08c21ad5282e5f826a016a386177d9874c2764751c031d634 rw,relatime shared:201 - ext4 /dev/mapper/docker-253:2-425882-bc4500479f18c2c08c21ad5282e5f826a016a386177d9874c2764751c031d634 rw,seclabel,discard,stripe=16,data=ordered

-    223 35 253:29 / /var/lib/docker/devicemapper/mnt/7770c8b24eb3d5cc159a065910076938910d307ab2f5d94e1dc3b24c06ee2c8a rw,relatime shared:205 - ext4 /dev/mapper/docker-253:2-425882-7770c8b24eb3d5cc159a065910076938910d307ab2f5d94e1dc3b24c06ee2c8a rw,seclabel,discard,stripe=16,data=ordered

-    227 35 253:30 / /var/lib/docker/devicemapper/mnt/c280cd3d0bf0aa36b478b292279671624cceafc1a67eaa920fa1082601297adf rw,relatime shared:209 - ext4 /dev/mapper/docker-253:2-425882-c280cd3d0bf0aa36b478b292279671624cceafc1a67eaa920fa1082601297adf rw,seclabel,discard,stripe=16,data=ordered

-    231 35 253:31 / /var/lib/docker/devicemapper/mnt/8b59a7d9340279f09fea67fd6ad89ddef711e9e7050eb647984f8b5ef006335f rw,relatime shared:213 - ext4 /dev/mapper/docker-253:2-425882-8b59a7d9340279f09fea67fd6ad89ddef711e9e7050eb647984f8b5ef006335f rw,seclabel,discard,stripe=16,data=ordered

-    235 35 253:32 / /var/lib/docker/devicemapper/mnt/1a28059f29eda821578b1bb27a60cc71f76f846a551abefabce6efd0146dce9f rw,relatime shared:217 - ext4 /dev/mapper/docker-253:2-425882-1a28059f29eda821578b1bb27a60cc71f76f846a551abefabce6efd0146dce9f rw,seclabel,discard,stripe=16,data=ordered

-    239 35 253:33 / /var/lib/docker/devicemapper/mnt/e9aa60c60128cad1 rw,relatime shared:221 - ext4 /dev/mapper/docker-253:2-425882-e9aa60c60128cad1 rw,seclabel,discard,stripe=16,data=ordered

-    243 35 253:34 / /var/lib/docker/devicemapper/mnt/5fec11304b6f4713fea7b6ccdcc1adc0a1966187f590fe25a8227428a8df275d-init rw,relatime shared:225 - ext4 /dev/mapper/docker-253:2-425882-5fec11304b6f4713fea7b6ccdcc1adc0a1966187f590fe25a8227428a8df275d-init rw,seclabel,discard,stripe=16,data=ordered

-    247 35 253:35 / /var/lib/docker/devicemapper/mnt/5fec11304b6f4713fea7b6ccdcc1adc0a1966187f590fe25a8227428a8df275d rw,relatime shared:229 - ext4 /dev/mapper/docker-253:2-425882-5fec11304b6f4713fea7b6ccdcc1adc0a1966187f590fe25a8227428a8df275d rw,seclabel,discard,stripe=16,data=ordered

-    31 21 0:23 / /DATA/foo_bla_bla rw,relatime - cifs //foo/BLA\040BLA\040BLA/ rw,sec=ntlm,cache=loose,unc=\\foo\BLA BLA BLA,username=my_login,domain=mydomain.com,uid=12345678,forceuid,gid=12345678,forcegid,addr=10.1.30.10,file_mode=0755,dir_mode=0755,nounix,rsize=61440,wsize=65536,actimeo=1`

+16 35 0:14 / /sys rw,nosuid,nodev,noexec,relatime shared:6 - sysfs sysfs rw,seclabel

+17 35 0:5 / /dev rw,nosuid shared:2 - devtmpfs devtmpfs rw,seclabel,size=8056484k,nr_inodes=2014121,mode=755

+18 16 0:15 / /sys/kernel/security rw,nosuid,nodev,noexec,relatime shared:7 - securityfs securityfs rw

+19 16 0:13 / /sys/fs/selinux rw,relatime shared:8 - selinuxfs selinuxfs rw

+20 17 0:16 / /dev/shm rw,nosuid,nodev shared:3 - tmpfs tmpfs rw,seclabel

+21 17 0:10 / /dev/pts rw,nosuid,noexec,relatime shared:4 - devpts devpts rw,seclabel,gid=5,mode=620,ptmxmode=000

+22 35 0:17 / /run rw,nosuid,nodev shared:21 - tmpfs tmpfs rw,seclabel,mode=755

+23 16 0:18 / /sys/fs/cgroup rw,nosuid,nodev,noexec shared:9 - tmpfs tmpfs rw,seclabel,mode=755

+24 23 0:19 / /sys/fs/cgroup/systemd rw,nosuid,nodev,noexec,relatime shared:10 - cgroup cgroup rw,xattr,release_agent=/usr/lib/systemd/systemd-cgroups-agent,name=systemd

+25 16 0:20 / /sys/fs/pstore rw,nosuid,nodev,noexec,relatime shared:20 - pstore pstore rw

+26 23 0:21 / /sys/fs/cgroup/cpuset rw,nosuid,nodev,noexec,relatime shared:11 - cgroup cgroup rw,cpuset,clone_children

+27 23 0:22 / /sys/fs/cgroup/cpu,cpuacct rw,nosuid,nodev,noexec,relatime shared:12 - cgroup cgroup rw,cpuacct,cpu,clone_children

+28 23 0:23 / /sys/fs/cgroup/memory rw,nosuid,nodev,noexec,relatime shared:13 - cgroup cgroup rw,memory,clone_children

+29 23 0:24 / /sys/fs/cgroup/devices rw,nosuid,nodev,noexec,relatime shared:14 - cgroup cgroup rw,devices,clone_children

+30 23 0:25 / /sys/fs/cgroup/freezer rw,nosuid,nodev,noexec,relatime shared:15 - cgroup cgroup rw,freezer,clone_children

+31 23 0:26 / /sys/fs/cgroup/net_cls rw,nosuid,nodev,noexec,relatime shared:16 - cgroup cgroup rw,net_cls,clone_children

+32 23 0:27 / /sys/fs/cgroup/blkio rw,nosuid,nodev,noexec,relatime shared:17 - cgroup cgroup rw,blkio,clone_children

+33 23 0:28 / /sys/fs/cgroup/perf_event rw,nosuid,nodev,noexec,relatime shared:18 - cgroup cgroup rw,perf_event,clone_children

+34 23 0:29 / /sys/fs/cgroup/hugetlb rw,nosuid,nodev,noexec,relatime shared:19 - cgroup cgroup rw,hugetlb,clone_children

+35 1 253:2 / / rw,relatime shared:1 - ext4 /dev/mapper/ssd-root--f20 rw,seclabel,data=ordered

+36 15 0:30 / /proc/sys/fs/binfmt_misc rw,relatime shared:22 - autofs systemd-1 rw,fd=38,pgrp=1,timeout=300,minproto=5,maxproto=5,direct

+37 17 0:12 / /dev/mqueue rw,relatime shared:23 - mqueue mqueue rw,seclabel

+38 35 0:31 / /tmp rw shared:24 - tmpfs tmpfs rw,seclabel

+39 17 0:32 / /dev/hugepages rw,relatime shared:25 - hugetlbfs hugetlbfs rw,seclabel

+40 16 0:7 / /sys/kernel/debug rw,relatime shared:26 - debugfs debugfs rw

+41 16 0:33 / /sys/kernel/config rw,relatime shared:27 - configfs configfs rw

+42 35 0:34 / /var/lib/nfs/rpc_pipefs rw,relatime shared:28 - rpc_pipefs sunrpc rw

+43 15 0:35 / /proc/fs/nfsd rw,relatime shared:29 - nfsd sunrpc rw

+45 35 8:17 / /boot rw,relatime shared:30 - ext4 /dev/sdb1 rw,seclabel,data=ordered

+46 35 253:4 / /home rw,relatime shared:31 - ext4 /dev/mapper/ssd-home rw,seclabel,data=ordered

+47 35 253:5 / /var/lib/libvirt/images rw,noatime,nodiratime shared:32 - ext4 /dev/mapper/ssd-virt rw,seclabel,discard,data=ordered

+48 35 253:12 / /mnt/old rw,relatime shared:33 - ext4 /dev/mapper/HelpDeskRHEL6-FedoraRoot rw,seclabel,data=ordered

+121 22 0:36 / /run/user/1000/gvfs rw,nosuid,nodev,relatime shared:104 - fuse.gvfsd-fuse gvfsd-fuse rw,user_id=1000,group_id=1000

+124 16 0:37 / /sys/fs/fuse/connections rw,relatime shared:107 - fusectl fusectl rw

+165 38 253:3 / /tmp/mnt rw,relatime shared:147 - ext4 /dev/mapper/ssd-root rw,seclabel,data=ordered

+167 35 253:15 / /var/lib/docker/devicemapper/mnt/aae4076022f0e2b80a2afbf8fc6df450c52080191fcef7fb679a73e6f073e5c2 rw,relatime shared:149 - ext4 /dev/mapper/docker-253:2-425882-aae4076022f0e2b80a2afbf8fc6df450c52080191fcef7fb679a73e6f073e5c2 rw,seclabel,discard,stripe=16,data=ordered

+171 35 253:16 / /var/lib/docker/devicemapper/mnt/c71be651f114db95180e472f7871b74fa597ee70a58ccc35cb87139ddea15373 rw,relatime shared:153 - ext4 /dev/mapper/docker-253:2-425882-c71be651f114db95180e472f7871b74fa597ee70a58ccc35cb87139ddea15373 rw,seclabel,discard,stripe=16,data=ordered

+175 35 253:17 / /var/lib/docker/devicemapper/mnt/1bac6ab72862d2d5626560df6197cf12036b82e258c53d981fa29adce6f06c3c rw,relatime shared:157 - ext4 /dev/mapper/docker-253:2-425882-1bac6ab72862d2d5626560df6197cf12036b82e258c53d981fa29adce6f06c3c rw,seclabel,discard,stripe=16,data=ordered

+179 35 253:18 / /var/lib/docker/devicemapper/mnt/d710a357d77158e80d5b2c55710ae07c94e76d34d21ee7bae65ce5418f739b09 rw,relatime shared:161 - ext4 /dev/mapper/docker-253:2-425882-d710a357d77158e80d5b2c55710ae07c94e76d34d21ee7bae65ce5418f739b09 rw,seclabel,discard,stripe=16,data=ordered

+183 35 253:19 / /var/lib/docker/devicemapper/mnt/6479f52366114d5f518db6837254baab48fab39f2ac38d5099250e9a6ceae6c7 rw,relatime shared:165 - ext4 /dev/mapper/docker-253:2-425882-6479f52366114d5f518db6837254baab48fab39f2ac38d5099250e9a6ceae6c7 rw,seclabel,discard,stripe=16,data=ordered

+187 35 253:20 / /var/lib/docker/devicemapper/mnt/8d9df91c4cca5aef49eeb2725292aab324646f723a7feab56be34c2ad08268e1 rw,relatime shared:169 - ext4 /dev/mapper/docker-253:2-425882-8d9df91c4cca5aef49eeb2725292aab324646f723a7feab56be34c2ad08268e1 rw,seclabel,discard,stripe=16,data=ordered

+191 35 253:21 / /var/lib/docker/devicemapper/mnt/c8240b768603d32e920d365dc9d1dc2a6af46cd23e7ae819947f969e1b4ec661 rw,relatime shared:173 - ext4 /dev/mapper/docker-253:2-425882-c8240b768603d32e920d365dc9d1dc2a6af46cd23e7ae819947f969e1b4ec661 rw,seclabel,discard,stripe=16,data=ordered

+195 35 253:22 / /var/lib/docker/devicemapper/mnt/2eb3a01278380bbf3ed12d86ac629eaa70a4351301ee307a5cabe7b5f3b1615f rw,relatime shared:177 - ext4 /dev/mapper/docker-253:2-425882-2eb3a01278380bbf3ed12d86ac629eaa70a4351301ee307a5cabe7b5f3b1615f rw,seclabel,discard,stripe=16,data=ordered

+199 35 253:23 / /var/lib/docker/devicemapper/mnt/37a17fb7c9d9b80821235d5f2662879bd3483915f245f9b49cdaa0e38779b70b rw,relatime shared:181 - ext4 /dev/mapper/docker-253:2-425882-37a17fb7c9d9b80821235d5f2662879bd3483915f245f9b49cdaa0e38779b70b rw,seclabel,discard,stripe=16,data=ordered

+203 35 253:24 / /var/lib/docker/devicemapper/mnt/aea459ae930bf1de913e2f29428fd80ee678a1e962d4080019d9f9774331ee2b rw,relatime shared:185 - ext4 /dev/mapper/docker-253:2-425882-aea459ae930bf1de913e2f29428fd80ee678a1e962d4080019d9f9774331ee2b rw,seclabel,discard,stripe=16,data=ordered

+207 35 253:25 / /var/lib/docker/devicemapper/mnt/928ead0bc06c454bd9f269e8585aeae0a6bd697f46dc8754c2a91309bc810882 rw,relatime shared:189 - ext4 /dev/mapper/docker-253:2-425882-928ead0bc06c454bd9f269e8585aeae0a6bd697f46dc8754c2a91309bc810882 rw,seclabel,discard,stripe=16,data=ordered

+211 35 253:26 / /var/lib/docker/devicemapper/mnt/0f284d18481d671644706e7a7244cbcf63d590d634cc882cb8721821929d0420 rw,relatime shared:193 - ext4 /dev/mapper/docker-253:2-425882-0f284d18481d671644706e7a7244cbcf63d590d634cc882cb8721821929d0420 rw,seclabel,discard,stripe=16,data=ordered

+215 35 253:27 / /var/lib/docker/devicemapper/mnt/d9dd16722ab34c38db2733e23f69e8f4803ce59658250dd63e98adff95d04919 rw,relatime shared:197 - ext4 /dev/mapper/docker-253:2-425882-d9dd16722ab34c38db2733e23f69e8f4803ce59658250dd63e98adff95d04919 rw,seclabel,discard,stripe=16,data=ordered

+219 35 253:28 / /var/lib/docker/devicemapper/mnt/bc4500479f18c2c08c21ad5282e5f826a016a386177d9874c2764751c031d634 rw,relatime shared:201 - ext4 /dev/mapper/docker-253:2-425882-bc4500479f18c2c08c21ad5282e5f826a016a386177d9874c2764751c031d634 rw,seclabel,discard,stripe=16,data=ordered

+223 35 253:29 / /var/lib/docker/devicemapper/mnt/7770c8b24eb3d5cc159a065910076938910d307ab2f5d94e1dc3b24c06ee2c8a rw,relatime shared:205 - ext4 /dev/mapper/docker-253:2-425882-7770c8b24eb3d5cc159a065910076938910d307ab2f5d94e1dc3b24c06ee2c8a rw,seclabel,discard,stripe=16,data=ordered

+227 35 253:30 / /var/lib/docker/devicemapper/mnt/c280cd3d0bf0aa36b478b292279671624cceafc1a67eaa920fa1082601297adf rw,relatime shared:209 - ext4 /dev/mapper/docker-253:2-425882-c280cd3d0bf0aa36b478b292279671624cceafc1a67eaa920fa1082601297adf rw,seclabel,discard,stripe=16,data=ordered

+231 35 253:31 / /var/lib/docker/devicemapper/mnt/8b59a7d9340279f09fea67fd6ad89ddef711e9e7050eb647984f8b5ef006335f rw,relatime shared:213 - ext4 /dev/mapper/docker-253:2-425882-8b59a7d9340279f09fea67fd6ad89ddef711e9e7050eb647984f8b5ef006335f rw,seclabel,discard,stripe=16,data=ordered

+235 35 253:32 / /var/lib/docker/devicemapper/mnt/1a28059f29eda821578b1bb27a60cc71f76f846a551abefabce6efd0146dce9f rw,relatime shared:217 - ext4 /dev/mapper/docker-253:2-425882-1a28059f29eda821578b1bb27a60cc71f76f846a551abefabce6efd0146dce9f rw,seclabel,discard,stripe=16,data=ordered

+239 35 253:33 / /var/lib/docker/devicemapper/mnt/e9aa60c60128cad1 rw,relatime shared:221 - ext4 /dev/mapper/docker-253:2-425882-e9aa60c60128cad1 rw,seclabel,discard,stripe=16,data=ordered

+243 35 253:34 / /var/lib/docker/devicemapper/mnt/5fec11304b6f4713fea7b6ccdcc1adc0a1966187f590fe25a8227428a8df275d-init rw,relatime shared:225 - ext4 /dev/mapper/docker-253:2-425882-5fec11304b6f4713fea7b6ccdcc1adc0a1966187f590fe25a8227428a8df275d-init rw,seclabel,discard,stripe=16,data=ordered

+247 35 253:35 / /var/lib/docker/devicemapper/mnt/5fec11304b6f4713fea7b6ccdcc1adc0a1966187f590fe25a8227428a8df275d rw,relatime shared:229 - ext4 /dev/mapper/docker-253:2-425882-5fec11304b6f4713fea7b6ccdcc1adc0a1966187f590fe25a8227428a8df275d rw,seclabel,discard,stripe=16,data=ordered

+31 21 0:23 / /DATA/foo_bla_bla rw,relatime - cifs //foo/BLA\040BLA\040BLA/ rw,sec=ntlm,cache=loose,unc=\\foo\BLA BLA BLA,username=my_login,domain=mydomain.com,uid=12345678,forceuid,gid=12345678,forcegid,addr=10.1.30.10,file_mode=0755,dir_mode=0755,nounix,rsize=61440,wsize=65536,actimeo=1`

 	ubuntuMountInfo = `15 20 0:14 / /sys rw,nosuid,nodev,noexec,relatime - sysfs sysfs rw

 16 20 0:3 / /proc rw,nosuid,nodev,noexec,relatime - proc proc rw

@@ -424,7 +426,7 @@ const (

 func TestParseFedoraMountinfo(t *testing.T) {

 	r := bytes.NewBuffer([]byte(fedoraMountinfo))

-	_, err := parseInfoFile(r)

+	_, err := parseInfoFile(r, nil)

 	if err != nil {

 		t.Fatal(err)

 	}

@@ -432,7 +434,7 @@ func TestParseFedoraMountinfo(t *testing.T) {

 func TestParseUbuntuMountinfo(t *testing.T) {

 	r := bytes.NewBuffer([]byte(ubuntuMountInfo))

-	_, err := parseInfoFile(r)

+	_, err := parseInfoFile(r, nil)

 	if err != nil {

 		t.Fatal(err)

 	}

@@ -440,7 +442,7 @@ func TestParseUbuntuMountinfo(t *testing.T) {

 func TestParseGentooMountinfo(t *testing.T) {

 	r := bytes.NewBuffer([]byte(gentooMountinfo))

-	_, err := parseInfoFile(r)

+	_, err := parseInfoFile(r, nil)

 	if err != nil {

 		t.Fatal(err)

 	}

@@ -448,7 +450,7 @@ func TestParseGentooMountinfo(t *testing.T) {

 func TestParseFedoraMountinfoFields(t *testing.T) {

 	r := bytes.NewBuffer([]byte(fedoraMountinfo))

-	infos, err := parseInfoFile(r)

+	infos, err := parseInfoFile(r, nil)

 	if err != nil {

 		t.Fatal(err)

 	}

@@ -474,3 +476,33 @@ func TestParseFedoraMountinfoFields(t *testing.T) {

 		t.Fatalf("expected %#v, got %#v", mi, infos[0])

 	}

 }

+

+func TestParseMountinfoFilters(t *testing.T) {

+	r := bytes.NewReader([]byte(fedoraMountinfo))

+

+	infos, err := parseInfoFile(r, SingleEntryFilter("/sys/fs/cgroup"))

+	assert.NilError(t, err)

+	assert.Equal(t, 1, len(infos))

+

+	r.Reset([]byte(fedoraMountinfo))

+	infos, err = parseInfoFile(r, SingleEntryFilter("nonexistent"))

+	assert.NilError(t, err)

+	assert.Equal(t, 0, len(infos))

+

+	r.Reset([]byte(fedoraMountinfo))

+	infos, err = parseInfoFile(r, PrefixFilter("/sys"))

+	assert.NilError(t, err)

+	// there are 18 entries starting with /sys in fedoraMountinfo

+	assert.Equal(t, 18, len(infos))

+

+	r.Reset([]byte(fedoraMountinfo))

+	infos, err = parseInfoFile(r, PrefixFilter("nonexistent"))

+	assert.NilError(t, err)

+	assert.Equal(t, 0, len(infos))

+

+	r.Reset([]byte(fedoraMountinfo))

+	infos, err = parseInfoFile(r, ParentsFilter("/sys/fs/cgroup/cpu,cpuacct"))

+	assert.NilError(t, err)

+	// there should be 4 results returned: /sys/fs/cgroup/cpu,cpuacct /sys/fs/cgroup /sys /

+	assert.Equal(t, 4, len(infos))

+}

@@ -7,6 +7,6 @@ import (

 	"runtime"

 )

-func parseMountTable() ([]*Info, error) {

+func parseMountTable(f FilterFunc) ([]*Info, error) {

 	return nil, fmt.Errorf("mount.parseMountTable is not implemented on %s/%s", runtime.GOOS, runtime.GOARCH)

 }

@@ -1,6 +1,6 @@

 package mount // import "github.com/docker/docker/pkg/mount"

-func parseMountTable() ([]*Info, error) {

+func parseMountTable(f FilterFunc) ([]*Info, error) {

 	// Do NOT return an error!

 	return nil, nil

 }

@@ -19,7 +19,6 @@ import (

 	"github.com/docker/docker/pkg/mount"

 	"github.com/docker/docker/volume"

 	"github.com/pkg/errors"

-	"github.com/sirupsen/logrus"

 )

 // VolumeDataPathName is the name of the directory where the volume data is stored.

@@ -66,11 +65,6 @@ func New(scope string, rootIDs idtools.IDPair) (*Root, error) {

 		return nil, err

 	}

-	mountInfos, err := mount.GetMounts()

-	if err != nil {

-		logrus.Debugf("error looking up mounts for local volume cleanup: %v", err)

-	}

-

 	for _, d := range dirs {

 		if !d.IsDir() {

 			continue

@@ -96,12 +90,7 @@ func New(scope string, rootIDs idtools.IDPair) (*Root, error) {

 			}

 			// unmount anything that may still be mounted (for example, from an unclean shutdown)

-			for _, info := range mountInfos {

-				if info.Mountpoint == v.path {

-					mount.Unmount(v.path)

-					break

-				}

-			}

+			mount.Unmount(v.path)

 		}

 	}

@@ -184,6 +184,10 @@ func TestCreateWithOpts(t *testing.T) {

 	if runtime.GOOS == "windows" {

 		t.Skip()

 	}

+	if os.Getuid() != 0 {

+		t.Skip("root required")

+	}

+

 	rootDir, err := ioutil.TempDir("", "local-volume-test")

 	if err != nil {

 		t.Fatal(err)

@@ -215,33 +219,27 @@ func TestCreateWithOpts(t *testing.T) {

 		}

 	}()

-	mountInfos, err := mount.GetMounts()

+	mountInfos, err := mount.GetMounts(mount.SingleEntryFilter(dir))

 	if err != nil {

 		t.Fatal(err)

 	}

-

-	var found bool

-	for _, info := range mountInfos {

-		if info.Mountpoint == dir {

-			found = true

-			if info.Fstype != "tmpfs" {

-				t.Fatalf("expected tmpfs mount, got %q", info.Fstype)

-			}

-			if info.Source != "tmpfs" {

-				t.Fatalf("expected tmpfs mount, got %q", info.Source)

-			}

-			if !strings.Contains(info.VfsOpts, "uid=1000") {

-				t.Fatalf("expected mount info to have uid=1000: %q", info.VfsOpts)

-			}

-			if !strings.Contains(info.VfsOpts, "size=1024k") {

-				t.Fatalf("expected mount info to have size=1024k: %q", info.VfsOpts)

-			}

-			break

-		}

+	if len(mountInfos) != 1 {

+		t.Fatalf("expected 1 mount, found %d: %+v", len(mountInfos), mountInfos)

 	}

-	if !found {

-		t.Fatal("mount not found")

+	info := mountInfos[0]

+	t.Logf("%+v", info)

+	if info.Fstype != "tmpfs" {

+		t.Fatalf("expected tmpfs mount, got %q", info.Fstype)

+	}

+	if info.Source != "tmpfs" {

+		t.Fatalf("expected tmpfs mount, got %q", info.Source)

+	}

+	if !strings.Contains(info.VfsOpts, "uid=1000") {

+		t.Fatalf("expected mount info to have uid=1000: %q", info.VfsOpts)

+	}

+	if !strings.Contains(info.VfsOpts, "size=1024k") {

+		t.Fatalf("expected mount info to have size=1024k: %q", info.VfsOpts)

 	}

 	if v.active.count != 1 {