coosld/kubo
1
0
Fork 0
mirror of https://github.com/ipfs/kubo.git synced 2026-02-25 04:17:44 +08:00
Code Issues Actions 14 Packages Projects Releases Wiki Activity

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

Browse Source 
Adder: Don't hold the PinLock when not pinning.
This commit is contained in:
Jeromy Johnson 2016-09-14 18:49:08 -04:00 committed by GitHub
commit 73cd8b3e98
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/coreunix/add.go
View File

@ -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