diff options
author | gVisor bot <gvisor-bot@google.com> | 2020-05-05 19:14:09 +0000 |
---|---|---|
committer | gVisor bot <gvisor-bot@google.com> | 2020-05-05 19:14:09 +0000 |
commit | 129633d5d7e16d74923fa97d6d1ac02d8fb8de1c (patch) | |
tree | e9fee90521244450854874ab62e71d9b8e5ba06f /pkg/sentry/fsimpl/sockfs | |
parent | 2e0241989cbd0c035766917abcadacdf58921fc0 (diff) | |
parent | faf89dd31a44b8409b32919d7193834e194ecc56 (diff) |
Merge release-20200422.0-29-gfaf89dd (automated)
Diffstat (limited to 'pkg/sentry/fsimpl/sockfs')
-rwxr-xr-x | pkg/sentry/fsimpl/sockfs/sockfs.go | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/pkg/sentry/fsimpl/sockfs/sockfs.go b/pkg/sentry/fsimpl/sockfs/sockfs.go index 3f085d3ca..239a9f4b4 100755 --- a/pkg/sentry/fsimpl/sockfs/sockfs.go +++ b/pkg/sentry/fsimpl/sockfs/sockfs.go @@ -53,9 +53,7 @@ func NewFilesystem(vfsObj *vfs.VirtualFilesystem) *vfs.Filesystem { // inode implements kernfs.Inode. // -// TODO(gvisor.dev/issue/1476): Add device numbers to this inode (which are -// not included in InodeAttrs) to store the numbers of the appropriate -// socket device. Override InodeAttrs.Stat() accordingly. +// TODO(gvisor.dev/issue/1193): Device numbers. type inode struct { kernfs.InodeNotDirectory kernfs.InodeNotSymlink @@ -69,11 +67,6 @@ func (i *inode) Open(ctx context.Context, rp *vfs.ResolvingPath, vfsd *vfs.Dentr } // NewDentry constructs and returns a sockfs dentry. -// -// TODO(gvisor.dev/issue/1476): Currently, we are using -// sockfs.filesystem.NextIno() to get inode numbers. We should use -// device-specific numbers, so that we are not using the same generator for -// netstack, unix, etc. func NewDentry(creds *auth.Credentials, ino uint64) *vfs.Dentry { // File mode matches net/socket.c:sock_alloc. filemode := linux.FileMode(linux.S_IFSOCK | 0600) |