Merge pull request #3222 from ipfs/kevina/add-no-pin-lock

Adder: Don't hold the PinLock when not pinning.
ipfs · Sep 14, 2016 · 73cd8b3 · 73cd8b3
2 parents 98fdffa + 7bf30c3
commit 73cd8b3
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/core/coreunix/add.go b/core/coreunix/add.go
@@ -349,9 +349,13 @@ func (adder *Adder) addNode(node *dag.Node, path string) error {
 
 // Add the given file while respecting the adder.
 func (adder *Adder) AddFile(file files.File) error {
-	adder.unlocker = adder.blockstore.PinLock()
+	if adder.Pin {
+		adder.unlocker = adder.blockstore.PinLock()
+	}
 	defer func() {
-		adder.unlocker.Unlock()
+		if adder.unlocker != nil {
+			adder.unlocker.Unlock()
+		}
 	}()
 
 	return adder.addFile(file)
@@ -432,7 +436,7 @@ func (adder *Adder) addDir(dir files.File) error {
 }
 
 func (adder *Adder) maybePauseForGC() error {
-	if adder.blockstore.GCRequested() {
+	if adder.unlocker != nil && adder.blockstore.GCRequested() {
 		err := adder.PinRoot()
 		if err != nil {
 			return err