diff options
| author | Ian Lewis <ianmlewis@gmail.com> | 2020-08-17 21:44:31 -0400 |
|---|---|---|
| committer | Ian Lewis <ianmlewis@gmail.com> | 2020-08-17 21:44:31 -0400 |
| commit | ac324f646ee3cb7955b0b45a7453aeb9671cbdf1 (patch) | |
| tree | 0cbc5018e8807421d701d190dc20525726c7ca76 /pkg/sentry/fs/gofer/fs.go | |
| parent | 352ae1022ce19de28fc72e034cc469872ad79d06 (diff) | |
| parent | 6d0c5803d557d453f15ac6f683697eeb46dab680 (diff) | |
Merge branch 'master' into ip-forwarding
- Merges aleksej-paschenko's with HEAD
- Adds vfs2 support for ip_forward
Diffstat (limited to 'pkg/sentry/fs/gofer/fs.go')
| -rw-r--r-- | pkg/sentry/fs/gofer/fs.go | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/pkg/sentry/fs/gofer/fs.go b/pkg/sentry/fs/gofer/fs.go index cf96dd9fa..8ae2d78d7 100644 --- a/pkg/sentry/fs/gofer/fs.go +++ b/pkg/sentry/fs/gofer/fs.go @@ -20,8 +20,8 @@ import ( "fmt" "strconv" + "gvisor.dev/gvisor/pkg/context" "gvisor.dev/gvisor/pkg/p9" - "gvisor.dev/gvisor/pkg/sentry/context" "gvisor.dev/gvisor/pkg/sentry/fs" ) @@ -60,8 +60,7 @@ const ( limitHostFDTranslationKey = "limit_host_fd_translation" // overlayfsStaleRead if present closes cached readonly file after the first - // write. This is done to workaround a limitation of overlayfs in kernels - // before 4.19 where open FDs are not updated after the file is copied up. + // write. This is done to workaround a limitation of Linux overlayfs. overlayfsStaleRead = "overlayfs_stale_read" ) |