Update vendor

vendor/github.com/docker/docker/layer/layer.go

@@ -171,7 +171,7 @@ type Store interface {
 	Get(ChainID) (Layer, error)
 	Release(Layer) ([]Metadata, error)
 
-	CreateRWLayer(id string, parent ChainID, mountLabel string, initFunc MountInit, storageOpt map[string]string) (RWLayer, error)
+	CreateRWLayer(id string, parent ChainID, mountLabel string, initFunc MountInit) (RWLayer, error)
 	GetRWLayer(id string) (RWLayer, error)
 	GetMountID(id string) (string, error)
 	ReinitRWLayer(l RWLayer) error

vendor/github.com/docker/docker/layer/layer_store.go

@@ -263,7 +263,7 @@ func (ls *layerStore) Register(ts io.Reader, parent ChainID) (Layer, error) {
 		references:     map[Layer]struct{}{},
 	}
 
-	if err = ls.driver.Create(layer.cacheID, pid, "", nil); err != nil {
+	if err = ls.driver.Create(layer.cacheID, pid, ""); err != nil {
 		return nil, err
 	}
 
@@ -417,7 +417,7 @@ func (ls *layerStore) Release(l Layer) ([]Metadata, error) {
 	return ls.releaseLayer(layer)
 }
 
-func (ls *layerStore) CreateRWLayer(name string, parent ChainID, mountLabel string, initFunc MountInit, storageOpt map[string]string) (RWLayer, error) {
+func (ls *layerStore) CreateRWLayer(name string, parent ChainID, mountLabel string, initFunc MountInit) (RWLayer, error) {
 	ls.mountL.Lock()
 	defer ls.mountL.Unlock()
 	m, ok := ls.mounts[name]
@@ -454,14 +454,14 @@ func (ls *layerStore) CreateRWLayer(name string, parent ChainID, mountLabel stri
 	}
 
 	if initFunc != nil {
-		pid, err = ls.initMount(m.mountID, pid, mountLabel, initFunc, storageOpt)
+		pid, err = ls.initMount(m.mountID, pid, mountLabel, initFunc)
 		if err != nil {
 			return nil, err
 		}
 		m.initID = pid
 	}
 
-	if err = ls.driver.CreateReadWrite(m.mountID, pid, "", storageOpt); err != nil {
+	if err = ls.driver.Create(m.mountID, pid, ""); err != nil {
 		return nil, err
 	}
 
@@ -583,14 +583,14 @@ func (ls *layerStore) saveMount(mount *mountedLayer) error {
 	return nil
 }
 
-func (ls *layerStore) initMount(graphID, parent, mountLabel string, initFunc MountInit, storageOpt map[string]string) (string, error) {
+func (ls *layerStore) initMount(graphID, parent, mountLabel string, initFunc MountInit) (string, error) {
 	// Use "<graph-id>-init" to maintain compatibility with graph drivers
 	// which are expecting this layer with this special name. If all
 	// graph drivers can be updated to not rely on knowing about this layer
 	// then the initID should be randomly generated.
 	initID := fmt.Sprintf("%s-init", graphID)
 
-	if err := ls.driver.Create(initID, parent, mountLabel, storageOpt); err != nil {
+	if err := ls.driver.Create(initID, parent, mountLabel); err != nil {
 		return "", err
 	}
 	p, err := ls.driver.Get(initID, "")

vendor/github.com/docker/docker/layer/layer_windows.go

@@ -1,98 +0,0 @@
-package layer
-
-import (
-	"errors"
-	"fmt"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/docker/distribution/digest"
-	"github.com/docker/docker/daemon/graphdriver"
-)
-
-// GetLayerPath returns the path to a layer
-func GetLayerPath(s Store, layer ChainID) (string, error) {
-	ls, ok := s.(*layerStore)
-	if !ok {
-		return "", errors.New("unsupported layer store")
-	}
-	ls.layerL.Lock()
-	defer ls.layerL.Unlock()
-
-	rl, ok := ls.layerMap[layer]
-	if !ok {
-		return "", ErrLayerDoesNotExist
-	}
-
-	path, err := ls.driver.Get(rl.cacheID, "")
-	if err != nil {
-		return "", err
-	}
-
-	if err := ls.driver.Put(rl.cacheID); err != nil {
-		return "", err
-	}
-
-	return path, nil
-}
-
-func (ls *layerStore) RegisterDiffID(graphID string, size int64) (Layer, error) {
-	var err error // this is used for cleanup in existingLayer case
-	diffID := digest.FromBytes([]byte(graphID))
-
-	// Create new roLayer
-	layer := &roLayer{
-		cacheID:        graphID,
-		diffID:         DiffID(diffID),
-		referenceCount: 1,
-		layerStore:     ls,
-		references:     map[Layer]struct{}{},
-		size:           size,
-	}
-
-	tx, err := ls.store.StartTransaction()
-	if err != nil {
-		return nil, err
-	}
-	defer func() {
-		if err != nil {
-			if err := tx.Cancel(); err != nil {
-				logrus.Errorf("Error canceling metadata transaction %q: %s", tx.String(), err)
-			}
-		}
-	}()
-
-	layer.chainID = createChainIDFromParent("", layer.diffID)
-
-	if !ls.driver.Exists(layer.cacheID) {
-		return nil, fmt.Errorf("layer %q is unknown to driver", layer.cacheID)
-	}
-	if err = storeLayer(tx, layer); err != nil {
-		return nil, err
-	}
-
-	ls.layerL.Lock()
-	defer ls.layerL.Unlock()
-
-	if existingLayer := ls.getWithoutLock(layer.chainID); existingLayer != nil {
-		// Set error for cleanup, but do not return
-		err = errors.New("layer already exists")
-		return existingLayer.getReference(), nil
-	}
-
-	if err = tx.Commit(layer.chainID); err != nil {
-		return nil, err
-	}
-
-	ls.layerMap[layer.chainID] = layer
-
-	return layer.getReference(), nil
-}
-
-func (ls *layerStore) mountID(name string) string {
-	// windows has issues if container ID doesn't match mount ID
-	return name
-}
-
-func (ls *layerStore) GraphDriver() graphdriver.Driver {
-	return ls.driver
-}