diff options
| author | gVisor bot <gvisor-bot@google.com> | 2019-06-21 23:35:56 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2019-06-21 23:35:56 +0000 |
| commit | 83a296f99157d0fceb60b06f0b966b48576ddb06 (patch) | |
| tree | a500f99e169b8601f41f8799ef7ca52c77515e79 /pkg/p9/handlers.go | |
| parent | 220a8e6b3ae44d26d4aaef741913648fff3619cd (diff) | |
| parent | 6f933a934f715f4bcd4f4e4430d4040b6cf61032 (diff) | |
Merge 6f933a93 (automated)
Diffstat (limited to 'pkg/p9/handlers.go')
| -rw-r--r-- | pkg/p9/handlers.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkg/p9/handlers.go b/pkg/p9/handlers.go index 9e622227b..999b4f684 100644 --- a/pkg/p9/handlers.go +++ b/pkg/p9/handlers.go @@ -224,7 +224,7 @@ func (t *Tattach) handle(cs *connState) message { file: sf, refs: 1, mode: attr.Mode.FileType(), - pathNode: &cs.server.pathTree, + pathNode: cs.server.pathTree, } defer root.DecRef() @@ -552,8 +552,8 @@ func (t *Tunlinkat) handle(cs *connState) message { // since we always acquire deeper in the hierarchy, we know // that we are free of lock cycles. childPathNode := ref.pathNode.pathNodeFor(t.Name) - childPathNode.mu.Lock() - defer childPathNode.mu.Unlock() + childPathNode.opMu.Lock() + defer childPathNode.opMu.Unlock() // Do the unlink. err = ref.file.UnlinkAt(t.Name, t.Flags) |