From 9a64f2bbb3d8fed35bb094c73dac54a13dcf7369 Mon Sep 17 00:00:00 2001 From: Carl Henrik Lunde Date: Tue, 8 Sep 2015 21:23:44 +0200 Subject: [PATCH] Use pkg/mount to support more flags in dm.mountopt The mount syscall does not handle string flags like "noatime", we must use bitmasks like MS_NOATIME instead. pkg/mount.Mount already handles this work. Signed-off-by: Carl Henrik Lunde --- daemon/graphdriver/devmapper/deviceset.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/daemon/graphdriver/devmapper/deviceset.go b/daemon/graphdriver/devmapper/deviceset.go index 70710082e4..20ab11f83c 100644 --- a/daemon/graphdriver/devmapper/deviceset.go +++ b/daemon/graphdriver/devmapper/deviceset.go @@ -21,6 +21,7 @@ import ( "github.com/Sirupsen/logrus" "github.com/docker/docker/daemon/graphdriver" "github.com/docker/docker/pkg/devicemapper" + "github.com/docker/docker/pkg/mount" "github.com/docker/docker/pkg/parsers" "github.com/docker/docker/pkg/units" "github.com/opencontainers/runc/libcontainer/label" @@ -1718,7 +1719,7 @@ func (devices *DeviceSet) MountDevice(hash, path, mountLabel string) error { options = joinMountOptions(options, devices.mountOptions) options = joinMountOptions(options, label.FormatMountLabel("", mountLabel)) - if err := syscall.Mount(info.DevName(), path, fstype, syscall.MS_MGC_VAL, options); err != nil { + if err := mount.Mount(info.DevName(), path, fstype, options); err != nil { return fmt.Errorf("Error mounting '%s' on '%s': %s", info.DevName(), path, err) }