summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/fs
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2019-12-17 22:05:30 +0000
committergVisor bot <gvisor-bot@google.com>2019-12-17 22:05:30 +0000
commit36e9af687a610967440986bea6f3512ceb974b03 (patch)
tree6586fff548b3b4f8421ce67c1d01b0a632a1350f /pkg/sentry/fs
parent9e57860d9561c1ac303f8b5ee03dddc68998314e (diff)
parent3ab90ecf256248d4147694df3a884572c1e8074b (diff)
Merge release-20191210.0-41-g3ab90ec (automated)
Diffstat (limited to 'pkg/sentry/fs')
-rw-r--r--pkg/sentry/fs/inode_overlay.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/sentry/fs/inode_overlay.go b/pkg/sentry/fs/inode_overlay.go
index 63a991beb..13d11e001 100644
--- a/pkg/sentry/fs/inode_overlay.go
+++ b/pkg/sentry/fs/inode_overlay.go
@@ -436,7 +436,7 @@ func overlayRename(ctx context.Context, o *overlayEntry, oldParent *Dirent, rena
}
func overlayBind(ctx context.Context, o *overlayEntry, parent *Dirent, name string, data transport.BoundEndpoint, perm FilePermissions) (*Dirent, error) {
- if err := copyUp(ctx, parent); err != nil {
+ if err := copyUpLockedForRename(ctx, parent); err != nil {
return nil, err
}