summaryrefslogtreecommitdiffhomepage
path: root/runsc
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2021-07-01 19:10:02 +0000
committergVisor bot <gvisor-bot@google.com>2021-07-01 19:10:02 +0000
commit9a66a5f3083af2d041ec1427ce67642be7aa6d9e (patch)
tree0d8bd6dcef07aadc55ab8ea8500d106b24b77fef /runsc
parent28291a5a5d25633c8bdf45ed5affe90f779c74b4 (diff)
parent590b8d3e99dd24d2bb625d00fa99fbc9296dfe2b (diff)
Merge release-20210628.0-16-g590b8d3e9 (automated)
Diffstat (limited to 'runsc')
-rw-r--r--runsc/boot/vfs.go3
1 files changed, 1 insertions, 2 deletions
diff --git a/runsc/boot/vfs.go b/runsc/boot/vfs.go
index ca1a86e39..346796d9c 100644
--- a/runsc/boot/vfs.go
+++ b/runsc/boot/vfs.go
@@ -45,7 +45,6 @@ import (
"gvisor.dev/gvisor/pkg/sentry/kernel"
"gvisor.dev/gvisor/pkg/sentry/kernel/auth"
"gvisor.dev/gvisor/pkg/sentry/vfs"
- "gvisor.dev/gvisor/pkg/syserror"
"gvisor.dev/gvisor/runsc/config"
"gvisor.dev/gvisor/runsc/specutils"
)
@@ -663,7 +662,7 @@ func (c *containerMounter) mountTmpVFS2(ctx context.Context, conf *config.Config
err := fd.IterDirents(ctx, vfs.IterDirentsCallbackFunc(func(dirent vfs.Dirent) error {
if dirent.Name != "." && dirent.Name != ".." {
- return syserror.ENOTEMPTY
+ return linuxerr.ENOTEMPTY
}
return nil
}))