Browse code

Windows: Remove dead code RegisterDiffIDs

Signed-off-by: John Howard <jhoward@microsoft.com>

John Howard authored on 2017/01/10 01:56:34
Showing 1 changed files
... ...
@@ -2,11 +2,8 @@ package layer
2 2
 
3 3
 import (
4 4
 	"errors"
5
-	"fmt"
6 5
 
7
-	"github.com/Sirupsen/logrus"
8 6
 	"github.com/docker/docker/daemon/graphdriver"
9
-	"github.com/opencontainers/go-digest"
10 7
 )
11 8
 
12 9
 // GetLayerPath returns the path to a layer
... ...
@@ -35,59 +32,6 @@ func GetLayerPath(s Store, layer ChainID) (string, error) {
35 35
 	return path, nil
36 36
 }
37 37
 
38
-func (ls *layerStore) RegisterDiffID(graphID string, size int64) (Layer, error) {
39
-	var err error // this is used for cleanup in existingLayer case
40
-	diffID := digest.FromBytes([]byte(graphID))
41
-
42
-	// Create new roLayer
43
-	layer := &roLayer{
44
-		cacheID:        graphID,
45
-		diffID:         DiffID(diffID),
46
-		referenceCount: 1,
47
-		layerStore:     ls,
48
-		references:     map[Layer]struct{}{},
49
-		size:           size,
50
-	}
51
-
52
-	tx, err := ls.store.StartTransaction()
53
-	if err != nil {
54
-		return nil, err
55
-	}
56
-	defer func() {
57
-		if err != nil {
58
-			if err := tx.Cancel(); err != nil {
59
-				logrus.Errorf("Error canceling metadata transaction %q: %s", tx.String(), err)
60
-			}
61
-		}
62
-	}()
63
-
64
-	layer.chainID = createChainIDFromParent("", layer.diffID)
65
-
66
-	if !ls.driver.Exists(layer.cacheID) {
67
-		return nil, fmt.Errorf("layer %q is unknown to driver", layer.cacheID)
68
-	}
69
-	if err = storeLayer(tx, layer); err != nil {
70
-		return nil, err
71
-	}
72
-
73
-	ls.layerL.Lock()
74
-	defer ls.layerL.Unlock()
75
-
76
-	if existingLayer := ls.getWithoutLock(layer.chainID); existingLayer != nil {
77
-		// Set error for cleanup, but do not return
78
-		err = errors.New("layer already exists")
79
-		return existingLayer.getReference(), nil
80
-	}
81
-
82
-	if err = tx.Commit(layer.chainID); err != nil {
83
-		return nil, err
84
-	}
85
-
86
-	ls.layerMap[layer.chainID] = layer
87
-
88
-	return layer.getReference(), nil
89
-}
90
-
91 38
 func (ls *layerStore) mountID(name string) string {
92 39
 	// windows has issues if container ID doesn't match mount ID
93 40
 	return name