diff options
author | Ayush Ranjan <ayushranjan@google.com> | 2019-07-29 20:11:24 -0700 |
---|---|---|
committer | gVisor bot <gvisor-bot@google.com> | 2019-07-29 20:12:37 -0700 |
commit | 8da9f8a12c51de41c4e048128a163fbb63679e4b (patch) | |
tree | 88dd537f92bf3b4d3e803bd7fdbf5b0693587607 /pkg/sentry/fs/ext/regular_file.go | |
parent | ddf25e3331a18a74d0e01d74fee7f82963fe778c (diff) |
Migrate from using io.ReadSeeker to io.ReaderAt.
This provides the following benefits:
- We can now use pkg/fd package which does not take ownership
of the file descriptor. So it does not close the fd when garbage collected.
This reduces scope of errors from unexpected garbage collection of io.File.
- It enforces the offset parameter in every read call.
It does not affect the fd offset nor is it affected by it. Hence reducing
scope of error of using stale offsets when reading.
- We do not need to serialize the usage of any global file descriptor anymore.
So this drops the mutual exclusion req hence reducing complexity and
congestion.
PiperOrigin-RevId: 260635174
Diffstat (limited to 'pkg/sentry/fs/ext/regular_file.go')
-rw-r--r-- | pkg/sentry/fs/ext/regular_file.go | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/pkg/sentry/fs/ext/regular_file.go b/pkg/sentry/fs/ext/regular_file.go index 9bf39acfe..b48f61795 100644 --- a/pkg/sentry/fs/ext/regular_file.go +++ b/pkg/sentry/fs/ext/regular_file.go @@ -29,10 +29,7 @@ type fileReader interface { // // This reader is not meant to be retained across Read operations as it needs // to be reinitialized with the correct offset for every Read. - // - // Precondition: Must hold the mutex of the filesystem containing dev while - // using the Reader. - getFileReader(dev io.ReadSeeker, blkSize uint64, offset uint64) io.Reader + getFileReader(dev io.ReaderAt, blkSize uint64, offset uint64) io.Reader } // regularFile represents a regular file's inode. This too follows the @@ -48,9 +45,7 @@ type regularFile struct { // newRegularFile is the regularFile constructor. It figures out what kind of // file this is and initializes the fileReader. -// -// Preconditions: Must hold the mutex of the filesystem containing dev. -func newRegularFile(dev io.ReadSeeker, blkSize uint64, inode inode) (*regularFile, error) { +func newRegularFile(dev io.ReaderAt, blkSize uint64, inode inode) (*regularFile, error) { regFile := regularFile{ inode: inode, } |