GitList

Browse code

daemon/mountVolumes: no need to specify fstype

For bind mounts, fstype argument to mount(2) is ignored.
Usual convention is either empty string or "none".

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>

Kir Kolyshkin authored on 2019/04/10 03:46:26
Showing 2 changed files

daemon/bindmount_unix.go index 028e300..0000000
daemon/volumes_unix.go index 5b47c46..13e0a90 100644

daemon/bindmount_unix.go

History View file @ 4e65b17

                     deleted file mode 100644
@@ -1,5 +0,0 @@
                     -// +build linux freebsd
+                    -
                     -package daemon // import "github.com/docker/docker/daemon"
+                    -
                     -const bindMountType = "bind"

daemon/volumes_unix.go

History View file @ 4e65b17

@@ -142,7 +142,7 @@ func (daemon *Daemon) mountVolumes(container *container.Container) error {
 			writeMode = "rw"
 		}
 		opts := strings.Join([]string{bindMode, writeMode}, ",")
-		if err := mount.Mount(m.Source, dest, bindMountType, opts); err != nil {
+		if err := mount.Mount(m.Source, dest, "", opts); err != nil {
 			return err
 		}
 

...	...	@@ -142,7 +142,7 @@ func (daemon Daemon) mountVolumes(container container.Container) error {
142	142	writeMode = "rw"
143	143	}
144	144	opts := strings.Join([]string{bindMode, writeMode}, ",")
145		- if err := mount.Mount(m.Source, dest, bindMountType, opts); err != nil {
	145	+ if err := mount.Mount(m.Source, dest, "", opts); err != nil {
146	146	return err
147	147	}
148	148