From 16da7e790f570d9743fb47e50c304e6a24834772 Mon Sep 17 00:00:00 2001 From: Dean Deng Date: Thu, 7 May 2020 10:19:11 -0700 Subject: [PATCH] Update privateunixsocket TODOs. Synthetic sockets do not have the race condition issue in VFS2, and we will get rid of privateunixsocket as well. Fixes #1200. PiperOrigin-RevId: 310386474 --- pkg/sentry/fs/gofer/session.go | 6 +++--- runsc/boot/vfs.go | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkg/sentry/fs/gofer/session.go b/pkg/sentry/fs/gofer/session.go index f6b3ef178..b5efc86f2 100644 --- a/pkg/sentry/fs/gofer/session.go +++ b/pkg/sentry/fs/gofer/session.go @@ -190,9 +190,9 @@ type session struct { // be socket/pipe files. This allows unix domain sockets and named pipes to // be used with paths that belong to a gofer. // - // TODO(gvisor.dev/issue/1200): there are few possible races with someone - // stat'ing the file and another deleting it concurrently, where the file - // will not be reported as socket file. + // There are a few possible races with someone stat'ing the file and another + // deleting it concurrently, where the file will not be reported as socket + // file. overrides *overrideMaps `state:"wait"` } diff --git a/runsc/boot/vfs.go b/runsc/boot/vfs.go index d1397ed2c..b94211866 100644 --- a/runsc/boot/vfs.go +++ b/runsc/boot/vfs.go @@ -301,8 +301,8 @@ func (c *containerMounter) getMountNameAndOptionsVFS2(conf *Config, m specs.Moun } // p9MountOptions creates a slice of options for a p9 mount. -// TODO(gvisor.dev/issue/1200): Remove this version in favor of the one in -// fs.go when privateunixsocket lands. +// TODO(gvisor.dev/issue/1624): Remove this version once privateunixsocket is +// deleted, along with the rest of VFS1. func p9MountOptionsVFS2(fd int, fa FileAccessType) []string { opts := []string{ "trans=fd",