undo files pinning stuff

whyrusleeping · whyrusleeping · commit 279f9d9649b2 · 2016-01-23T06:17:07.000-08:00
License: MIT
Signed-off-by: Jeromy &lt;jeromyj@gmail.com&gt;
diff --git a/core/commands/files/files.go b/core/commands/files/files.go
@@ -640,9 +640,6 @@ are run with the '--flush=false'.
 			return
 		}
 
-		// take the lock and defer the unlock
-		defer nd.Blockstore.PinLock().Unlock()
-
 		path := "/"
 		if len(req.Arguments()) > 0 {
 			path = req.Arguments()[0]
diff --git a/core/core.go b/core/core.go
@@ -474,30 +474,6 @@ func (n *IpfsNode) loadBootstrapPeers() ([]peer.PeerInfo, error) {
 func (n *IpfsNode) loadFilesRoot() error {
 	dsk := ds.NewKey("/local/filesroot")
 	pf := func(ctx context.Context, k key.Key) error {
-		defer n.Blockstore.PinLock().Unlock()
-		ds := n.Repo.Datastore()
-		if old, err := ds.Get(dsk); err == nil && old != nil {
-			err := n.Pinning.Unpin(ctx, key.Key(old.([]byte)), true)
-			switch err {
-			case nil, pin.ErrNotPinned:
-				break
-			default:
-				return err
-			}
-		}
-		nnd, err := n.DAG.Get(ctx, k)
-		if err != nil {
-			return err
-		}
-
-		if err := n.Pinning.Pin(ctx, nnd, true); err != nil {
-			return err
-		}
-
-		if err := n.Pinning.Flush(); err != nil {
-			return err
-		}
-
 		return n.Repo.Datastore().Put(dsk, []byte(k))
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -640,9 +640,6 @@ are run with the '--flush=false'.`
`640`	`640`	`return`
`641`	`641`	`}`
`642`	`642`
`643`		`- // take the lock and defer the unlock`
`644`		`- defer nd.Blockstore.PinLock().Unlock()`
`645`		`-`
`646`	`643`	`path := "/"`
`647`	`644`	`if len(req.Arguments()) > 0 {`
`648`	`645`	`path = req.Arguments()[0]`