From 03cf65bfb98dcf6a06197553686365c2d0552be5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Wed, 20 Sep 2017 20:45:14 +0200
Subject: [PATCH] dag: fix pin lock usage
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>
---
 core/commands/dag/dag.go | 48 +++++++++++++++++++++-------------------
 1 file changed, 25 insertions(+), 23 deletions(-)

diff --git a/core/commands/dag/dag.go b/core/commands/dag/dag.go
index 1d2653831e9..a6e57530da9 100644
--- a/core/commands/dag/dag.go
+++ b/core/commands/dag/dag.go
@@ -16,7 +16,6 @@ import (
 	cid "gx/ipfs/QmNp85zy9RLrQ5oQD4hPyS39ezrrXpcaa7R4Y9kxdWQLLQ/go-cid"
 	u "gx/ipfs/QmSU6eubNdhXjFBJBSksTp8kv8YRub8mGAPv8tVJHmL2EU/go-ipfs-util"
 	mh "gx/ipfs/QmU9a9NV9RdPNwZQDYd5uKsm6N6LJLSvLbywDDYFbaaC6P/go-multihash"
-	"reflect"
 )
 
 var DagCmd = &cmds.Command{
@@ -93,10 +92,6 @@ into an object of the specified format.
 			}
 		}
 
-		if dopin {
-			defer n.Blockstore.PinLock().Unlock()
-		}
-
 		outChan := make(chan interface{}, 8)
 		res.SetOutput((<-chan interface{})(outChan))
 
@@ -118,29 +113,37 @@ into an object of the specified format.
 					return fmt.Errorf("no node returned from ParseInputs")
 				}
 
-				b := n.DAG.Batch()
-				for _, nd := range nds {
-					_, err := b.Add(nd)
-					if err != nil {
-						return err
+				var cid *cid.Cid
+				err = func() error {
+					if dopin {
+						defer n.Blockstore.PinLock().Unlock()
 					}
-				}
-
-				if err := b.Commit(); err != nil {
-					return err
-				}
 
-				root := nds[0].Cid()
-				if dopin {
-					n.Pinning.PinWithMode(root, pin.Recursive)
+					b := n.DAG.Batch()
+					for _, nd := range nds {
+						_, err := b.Add(nd)
+						if err != nil {
+							return err
+						}
+					}
 
-					err := n.Pinning.Flush()
-					if err != nil {
+					if err := b.Commit(); err != nil {
 						return err
 					}
-				}
 
-				outChan <- &OutputObject{Cid: root}
+					cid = nds[0].Cid()
+					if dopin {
+						n.Pinning.PinWithMode(cid, pin.Recursive)
+
+						err := n.Pinning.Flush()
+						if err != nil {
+							return err
+						}
+					}
+					return nil
+				}()
+
+				outChan <- &OutputObject{Cid: cid}
 			}
 
 			return nil
@@ -159,7 +162,6 @@ into an object of the specified format.
 		cmds.Text: func(res cmds.Response) (io.Reader, error) {
 			outChan, ok := res.Output().(<-chan interface{})
 			if !ok {
-				fmt.Println(reflect.TypeOf(res.Output()))
 				return nil, u.ErrCast()
 			}