@@ -133,7 +133,7 @@ func (cli *DaemonCli) start(opts *daemonOptions) (err error) {

 		return err

 	}

-	if err := system.MkdirAll(cli.Config.ExecRoot, 0700, ""); err != nil {

+	if err := system.MkdirAll(cli.Config.ExecRoot, 0700); err != nil {

 		return err

 	}

@@ -41,7 +41,7 @@ func (container *Container) CreateSecretSymlinks() error {

 		if err != nil {

 			return err

 		}

-		if err := system.MkdirAll(filepath.Dir(resolvedPath), 0, ""); err != nil {

+		if err := system.MkdirAll(filepath.Dir(resolvedPath), 0); err != nil {

 			return err

 		}

 		if err := os.Symlink(filepath.Join(containerInternalSecretMountPath, r.SecretID), resolvedPath); err != nil {

@@ -91,7 +91,7 @@ func (container *Container) CreateConfigSymlinks() error {

 		if err != nil {

 			return err

 		}

-		if err := system.MkdirAll(filepath.Dir(resolvedPath), 0, ""); err != nil {

+		if err := system.MkdirAll(filepath.Dir(resolvedPath), 0); err != nil {

 			return err

 		}

 		if err := os.Symlink(filepath.Join(containerInternalConfigsDirPath, configRef.ConfigID), resolvedPath); err != nil {

@@ -772,7 +772,7 @@ func NewDaemon(ctx context.Context, config *config.Config, pluginStore *plugin.S

 	}

 	if runtime.GOOS == "windows" {

 		if _, err := os.Stat(realTmp); err != nil && os.IsNotExist(err) {

-			if err := system.MkdirAll(realTmp, 0700, ""); err != nil {

+			if err := system.MkdirAll(realTmp, 0700); err != nil {

 				return nil, fmt.Errorf("Unable to create the TempDir (%s): %s", realTmp, err)

 			}

 		}

@@ -834,7 +834,7 @@ func NewDaemon(ctx context.Context, config *config.Config, pluginStore *plugin.S

 	// Create the directory where we'll store the runtime scripts (i.e. in

 	// order to support runtimeArgs)

 	daemonRuntimes := filepath.Join(config.Root, "runtimes")

-	if err := system.MkdirAll(daemonRuntimes, 0700, ""); err != nil {

+	if err := system.MkdirAll(daemonRuntimes, 0700); err != nil {

 		return nil, err

 	}

 	if err := d.loadRuntimes(); err != nil {

@@ -842,7 +842,7 @@ func NewDaemon(ctx context.Context, config *config.Config, pluginStore *plugin.S

 	}

 	if runtime.GOOS == "windows" {

-		if err := system.MkdirAll(filepath.Join(config.Root, "credentialspecs"), 0, ""); err != nil {

+		if err := system.MkdirAll(filepath.Join(config.Root, "credentialspecs"), 0); err != nil {

 			return nil, err

 		}

 	}

@@ -981,7 +981,7 @@ func NewDaemon(ctx context.Context, config *config.Config, pluginStore *plugin.S

 	trustDir := filepath.Join(config.Root, "trust")

-	if err := system.MkdirAll(trustDir, 0700, ""); err != nil {

+	if err := system.MkdirAll(trustDir, 0700); err != nil {

 		return nil, err

 	}

@@ -17,7 +17,7 @@ import (

 // TODO: this should use more of libtrust.LoadOrCreateTrustKey which may need

 // a refactor or this function to be moved into libtrust

 func loadOrCreateTrustKey(trustKeyPath string) (libtrust.PrivateKey, error) {

-	err := system.MkdirAll(filepath.Dir(trustKeyPath), 0755, "")

+	err := system.MkdirAll(filepath.Dir(trustKeyPath), 0755)

 	if err != nil {

 		return nil, err

 	}

@@ -83,7 +83,7 @@ func Start(ctx context.Context, rootDir, stateDir string, opts ...DaemonOpt) (Da

 	}

 	r.setDefaults()

-	if err := system.MkdirAll(stateDir, 0700, ""); err != nil {

+	if err := system.MkdirAll(stateDir, 0700); err != nil {

 		return nil, err

 	}

@@ -1134,7 +1134,7 @@ func (archiver *Archiver) CopyFileWithTar(src, dst string) (err error) {

 		dst = filepath.Join(dst, filepath.Base(src))

 	}

 	// Create the holding directory if necessary

-	if err := system.MkdirAll(filepath.Dir(dst), 0700, ""); err != nil {

+	if err := system.MkdirAll(filepath.Dir(dst), 0700); err != nil {

 		return err

 	}

@@ -84,7 +84,7 @@ func UnpackLayer(dest string, layer io.Reader, options *TarOptions) (size int64,

 			parentPath := filepath.Join(dest, parent)

 			if _, err := os.Lstat(parentPath); err != nil && os.IsNotExist(err) {

-				err = system.MkdirAll(parentPath, 0600, "")

+				err = system.MkdirAll(parentPath, 0600)

 				if err != nil {

 					return 0, err

 				}

@@ -49,7 +49,7 @@ func TestChrootTarUntar(t *testing.T) {

 	}

 	defer os.RemoveAll(tmpdir)

 	src := filepath.Join(tmpdir, "src")

-	if err := system.MkdirAll(src, 0700, ""); err != nil {

+	if err := system.MkdirAll(src, 0700); err != nil {

 		t.Fatal(err)

 	}

 	if err := ioutil.WriteFile(filepath.Join(src, "toto"), []byte("hello toto"), 0644); err != nil {

@@ -63,7 +63,7 @@ func TestChrootTarUntar(t *testing.T) {

 		t.Fatal(err)

 	}

 	dest := filepath.Join(tmpdir, "src")

-	if err := system.MkdirAll(dest, 0700, ""); err != nil {

+	if err := system.MkdirAll(dest, 0700); err != nil {

 		t.Fatal(err)

 	}

 	if err := Untar(stream, dest, &archive.TarOptions{ExcludePatterns: []string{"lolo"}}); err != nil {

@@ -81,7 +81,7 @@ func TestChrootUntarWithHugeExcludesList(t *testing.T) {

 	}

 	defer os.RemoveAll(tmpdir)

 	src := filepath.Join(tmpdir, "src")

-	if err := system.MkdirAll(src, 0700, ""); err != nil {

+	if err := system.MkdirAll(src, 0700); err != nil {

 		t.Fatal(err)

 	}

 	if err := ioutil.WriteFile(filepath.Join(src, "toto"), []byte("hello toto"), 0644); err != nil {

@@ -92,7 +92,7 @@ func TestChrootUntarWithHugeExcludesList(t *testing.T) {

 		t.Fatal(err)

 	}

 	dest := filepath.Join(tmpdir, "dest")

-	if err := system.MkdirAll(dest, 0700, ""); err != nil {

+	if err := system.MkdirAll(dest, 0700); err != nil {

 		t.Fatal(err)

 	}

 	options := &archive.TarOptions{}

@@ -181,7 +181,7 @@ func TestChrootTarUntarWithSymlink(t *testing.T) {

 	}

 	defer os.RemoveAll(tmpdir)

 	src := filepath.Join(tmpdir, "src")

-	if err := system.MkdirAll(src, 0700, ""); err != nil {

+	if err := system.MkdirAll(src, 0700); err != nil {

 		t.Fatal(err)

 	}

 	if _, err := prepareSourceDirectory(10, src, false); err != nil {

@@ -205,7 +205,7 @@ func TestChrootCopyWithTar(t *testing.T) {

 	}

 	defer os.RemoveAll(tmpdir)

 	src := filepath.Join(tmpdir, "src")

-	if err := system.MkdirAll(src, 0700, ""); err != nil {

+	if err := system.MkdirAll(src, 0700); err != nil {

 		t.Fatal(err)

 	}

 	if _, err := prepareSourceDirectory(10, src, true); err != nil {

@@ -252,7 +252,7 @@ func TestChrootCopyFileWithTar(t *testing.T) {

 	}

 	defer os.RemoveAll(tmpdir)

 	src := filepath.Join(tmpdir, "src")

-	if err := system.MkdirAll(src, 0700, ""); err != nil {

+	if err := system.MkdirAll(src, 0700); err != nil {

 		t.Fatal(err)

 	}

 	if _, err := prepareSourceDirectory(10, src, true); err != nil {

@@ -297,7 +297,7 @@ func TestChrootUntarPath(t *testing.T) {

 	}

 	defer os.RemoveAll(tmpdir)

 	src := filepath.Join(tmpdir, "src")

-	if err := system.MkdirAll(src, 0700, ""); err != nil {

+	if err := system.MkdirAll(src, 0700); err != nil {

 		t.Fatal(err)

 	}

 	if _, err := prepareSourceDirectory(10, src, false); err != nil {

@@ -359,7 +359,7 @@ func TestChrootUntarEmptyArchiveFromSlowReader(t *testing.T) {

 	}

 	defer os.RemoveAll(tmpdir)

 	dest := filepath.Join(tmpdir, "dest")

-	if err := system.MkdirAll(dest, 0700, ""); err != nil {

+	if err := system.MkdirAll(dest, 0700); err != nil {

 		t.Fatal(err)

 	}

 	stream := &slowEmptyTarReader{size: 10240, chunkSize: 1024}

@@ -376,7 +376,7 @@ func TestChrootApplyEmptyArchiveFromSlowReader(t *testing.T) {

 	}

 	defer os.RemoveAll(tmpdir)

 	dest := filepath.Join(tmpdir, "dest")

-	if err := system.MkdirAll(dest, 0700, ""); err != nil {

+	if err := system.MkdirAll(dest, 0700); err != nil {

 		t.Fatal(err)

 	}

 	stream := &slowEmptyTarReader{size: 10240, chunkSize: 1024}

@@ -393,7 +393,7 @@ func TestChrootApplyDotDotFile(t *testing.T) {

 	}

 	defer os.RemoveAll(tmpdir)

 	src := filepath.Join(tmpdir, "src")

-	if err := system.MkdirAll(src, 0700, ""); err != nil {

+	if err := system.MkdirAll(src, 0700); err != nil {

 		t.Fatal(err)

 	}

 	if err := ioutil.WriteFile(filepath.Join(src, "..gitme"), []byte(""), 0644); err != nil {

@@ -404,7 +404,7 @@ func TestChrootApplyDotDotFile(t *testing.T) {

 		t.Fatal(err)

 	}

 	dest := filepath.Join(tmpdir, "dest")

-	if err := system.MkdirAll(dest, 0700, ""); err != nil {

+	if err := system.MkdirAll(dest, 0700); err != nil {

 		t.Fatal(err)

 	}

 	if _, err := ApplyLayer(dest, stream); err != nil {

@@ -113,7 +113,7 @@ func (archiver *Archiver) CopyFileWithTar(src, dst string) (err error) {

 	// os.MkdirAll on not-Windows and changed for Windows.

 	if dstDriver.OS() == "windows" {

 		// Now we are WCOW

-		if err := system.MkdirAll(filepath.Dir(dst), 0700, ""); err != nil {

+		if err := system.MkdirAll(filepath.Dir(dst), 0700); err != nil {

 			return err

 		}

 	} else {

@@ -59,7 +59,7 @@ func mkdirAs(path string, mode os.FileMode, owner Identity, mkAll, chownExisting

 				paths = append(paths, dirPath)

 			}

 		}

-		if err := system.MkdirAll(path, mode, ""); err != nil {

+		if err := system.MkdirAll(path, mode); err != nil {

 			return err

 		}

 	} else {

@@ -11,7 +11,7 @@ import (

 // Ownership is handled elsewhere, but in the future could be support here

 // too.

 func mkdirAs(path string, mode os.FileMode, owner Identity, mkAll, chownExisting bool) error {

-	if err := system.MkdirAll(path, mode, ""); err != nil {

+	if err := system.MkdirAll(path, mode); err != nil {

 		return err

 	}

 	return nil

@@ -37,7 +37,7 @@ func New(path string) (*PIDFile, error) {

 		return nil, err

 	}

 	// Note MkdirAll returns nil if a directory already exists

-	if err := system.MkdirAll(filepath.Dir(path), os.FileMode(0755), ""); err != nil {

+	if err := system.MkdirAll(filepath.Dir(path), os.FileMode(0755)); err != nil {

 		return nil, err

 	}

 	if err := ioutil.WriteFile(path, []byte(fmt.Sprintf("%d", os.Getpid())), 0644); err != nil {

deleted file mode 100644

@@ -1,67 +0,0 @@

-// +build !windows

-

-package system // import "github.com/docker/docker/pkg/system"

-

-import (

-	"io/ioutil"

-	"os"

-	"path/filepath"

-)

-

-// MkdirAllWithACL is a wrapper for MkdirAll on unix systems.

-func MkdirAllWithACL(path string, perm os.FileMode, sddl string) error {

-	return MkdirAll(path, perm, sddl)

-}

-

-// MkdirAll creates a directory named path along with any necessary parents,

-// with permission specified by attribute perm for all dir created.

-func MkdirAll(path string, perm os.FileMode, sddl string) error {

-	return os.MkdirAll(path, perm)

-}

-

-// IsAbs is a platform-specific wrapper for filepath.IsAbs.

-func IsAbs(path string) bool {

-	return filepath.IsAbs(path)

-}

-

-// The functions below here are wrappers for the equivalents in the os and ioutils packages.

-// They are passthrough on Unix platforms, and only relevant on Windows.

-

-// CreateSequential creates the named file with mode 0666 (before umask), truncating

-// it if it already exists. If successful, methods on the returned

-// File can be used for I/O; the associated file descriptor has mode

-// O_RDWR.

-// If there is an error, it will be of type *PathError.

-func CreateSequential(name string) (*os.File, error) {

-	return os.Create(name)

-}

-

-// OpenSequential opens the named file for reading. If successful, methods on

-// the returned file can be used for reading; the associated file

-// descriptor has mode O_RDONLY.

-// If there is an error, it will be of type *PathError.

-func OpenSequential(name string) (*os.File, error) {

-	return os.Open(name)

-}

-

-// OpenFileSequential is the generalized open call; most users will use Open

-// or Create instead. It opens the named file with specified flag

-// (O_RDONLY etc.) and perm, (0666 etc.) if applicable. If successful,

-// methods on the returned File can be used for I/O.

-// If there is an error, it will be of type *PathError.

-func OpenFileSequential(name string, flag int, perm os.FileMode) (*os.File, error) {

-	return os.OpenFile(name, flag, perm)

-}

-

-// TempFileSequential creates a new temporary file in the directory dir

-// with a name beginning with prefix, opens the file for reading

-// and writing, and returns the resulting *os.File.

-// If dir is the empty string, TempFile uses the default directory

-// for temporary files (see os.TempDir).

-// Multiple programs calling TempFile simultaneously

-// will not choose the same file. The caller can use f.Name()

-// to find the pathname of the file. It is the caller's responsibility

-// to remove the file when no longer needed.

-func TempFileSequential(dir, prefix string) (f *os.File, err error) {

-	return ioutil.TempFile(dir, prefix)

-}

new file mode 100644

@@ -0,0 +1,67 @@

+// +build !windows

+

+package system // import "github.com/docker/docker/pkg/system"

+

+import (

+	"io/ioutil"

+	"os"

+	"path/filepath"

+)

+

+// MkdirAllWithACL is a wrapper for os.MkdirAll on unix systems.

+func MkdirAllWithACL(path string, perm os.FileMode, sddl string) error {

+	return os.MkdirAll(path, perm)

+}

+

+// MkdirAll creates a directory named path along with any necessary parents,

+// with permission specified by attribute perm for all dir created.

+func MkdirAll(path string, perm os.FileMode) error {

+	return os.MkdirAll(path, perm)

+}

+

+// IsAbs is a platform-specific wrapper for filepath.IsAbs.

+func IsAbs(path string) bool {

+	return filepath.IsAbs(path)

+}

+

+// The functions below here are wrappers for the equivalents in the os and ioutils packages.

+// They are passthrough on Unix platforms, and only relevant on Windows.

+

+// CreateSequential creates the named file with mode 0666 (before umask), truncating

+// it if it already exists. If successful, methods on the returned

+// File can be used for I/O; the associated file descriptor has mode

+// O_RDWR.

+// If there is an error, it will be of type *PathError.

+func CreateSequential(name string) (*os.File, error) {

+	return os.Create(name)

+}

+

+// OpenSequential opens the named file for reading. If successful, methods on

+// the returned file can be used for reading; the associated file

+// descriptor has mode O_RDONLY.

+// If there is an error, it will be of type *PathError.

+func OpenSequential(name string) (*os.File, error) {

+	return os.Open(name)

+}

+

+// OpenFileSequential is the generalized open call; most users will use Open

+// or Create instead. It opens the named file with specified flag

+// (O_RDONLY etc.) and perm, (0666 etc.) if applicable. If successful,

+// methods on the returned File can be used for I/O.

+// If there is an error, it will be of type *PathError.

+func OpenFileSequential(name string, flag int, perm os.FileMode) (*os.File, error) {

+	return os.OpenFile(name, flag, perm)

+}

+

+// TempFileSequential creates a new temporary file in the directory dir

+// with a name beginning with prefix, opens the file for reading

+// and writing, and returns the resulting *os.File.

+// If dir is the empty string, TempFile uses the default directory

+// for temporary files (see os.TempDir).

+// Multiple programs calling TempFile simultaneously

+// will not choose the same file. The caller can use f.Name()

+// to find the pathname of the file. It is the caller's responsibility

+// to remove the file when no longer needed.

+func TempFileSequential(dir, prefix string) (f *os.File, err error) {

+	return ioutil.TempFile(dir, prefix)

+}

@@ -26,9 +26,10 @@ func MkdirAllWithACL(path string, perm os.FileMode, sddl string) error {

 	return mkdirall(path, true, sddl)

 }

-// MkdirAll implementation that is volume path aware for Windows.

-func MkdirAll(path string, _ os.FileMode, sddl string) error {

-	return mkdirall(path, false, sddl)

+// MkdirAll implementation that is volume path aware for Windows. It can be used

+// as a drop-in replacement for os.MkdirAll()

+func MkdirAll(path string, _ os.FileMode) error {

+	return mkdirall(path, false, "")

 }

 // mkdirall is a custom version of os.MkdirAll modified for use on Windows