diff options
| author | Dean Deng <deandeng@google.com> | 2020-04-28 17:42:11 -0700 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-04-28 17:43:14 -0700 |
| commit | f93f2fda74f31246e8866783f6c4be2318bdedd6 (patch) | |
| tree | 0a7c4c69a7caa0b09a26db92693055067ecbde67 | |
| parent | 37a59bc76da7e0b20be3cef1fcb1d5cb8fbc839d (diff) | |
Deduplicate unix socket Release() method.
PiperOrigin-RevId: 308932254
| -rw-r--r-- | pkg/sentry/socket/unix/unix.go | 2 | ||||
| -rw-r--r-- | pkg/sentry/socket/unix/unix_vfs2.go | 7 |
2 files changed, 1 insertions, 8 deletions
diff --git a/pkg/sentry/socket/unix/unix.go b/pkg/sentry/socket/unix/unix.go index 9aad41c9e..ddd0eda4b 100644 --- a/pkg/sentry/socket/unix/unix.go +++ b/pkg/sentry/socket/unix/unix.go @@ -103,7 +103,7 @@ func (s *socketOpsCommon) DecRef() { } // Release implemements fs.FileOperations.Release. -func (s *SocketOperations) Release() { +func (s *socketOpsCommon) Release() { // Release only decrements a reference on s because s may be referenced in // the abstract socket namespace. s.DecRef() diff --git a/pkg/sentry/socket/unix/unix_vfs2.go b/pkg/sentry/socket/unix/unix_vfs2.go index 315dc274f..433cde9cb 100644 --- a/pkg/sentry/socket/unix/unix_vfs2.go +++ b/pkg/sentry/socket/unix/unix_vfs2.go @@ -273,13 +273,6 @@ func (s *SocketVFS2) Write(ctx context.Context, src usermem.IOSequence, opts vfs }) } -// Release implements vfs.FileDescriptionImpl. -func (s *SocketVFS2) Release() { - // Release only decrements a reference on s because s may be referenced in - // the abstract socket namespace. - s.DecRef() -} - // Readiness implements waiter.Waitable.Readiness. func (s *SocketVFS2) Readiness(mask waiter.EventMask) waiter.EventMask { return s.socketOpsCommon.Readiness(mask) |