diff options
| author | Fabricio Voznika <fvoznika@google.com> | 2019-06-03 18:19:52 -0700 |
|---|---|---|
| committer | Shentubot <shentubot@google.com> | 2019-06-03 18:20:57 -0700 |
| commit | f1aee6a7ad261e952bd6f260ede6be32187a1f10 (patch) | |
| tree | 12e80fa3432d46af80989057b016997468cc891b /runsc/boot/fds.go | |
| parent | d28f71adcf60793a81490f3b4d25da36901e769e (diff) | |
Refactor container FS setup
No change in functionaly. Added containerMounter object
to keep state while the mounts are processed. This will
help upcoming changes to share mounts per-pod.
PiperOrigin-RevId: 251350096
Diffstat (limited to 'runsc/boot/fds.go')
| -rw-r--r-- | runsc/boot/fds.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/runsc/boot/fds.go b/runsc/boot/fds.go index 4e428b49c..0811e10f4 100644 --- a/runsc/boot/fds.go +++ b/runsc/boot/fds.go @@ -28,11 +28,12 @@ import ( // createFDMap creates an FD map that contains stdin, stdout, and stderr. If // console is true, then ioctl calls will be passed through to the host FD. // Upon success, createFDMap dups then closes stdioFDs. -func createFDMap(ctx context.Context, k *kernel.Kernel, l *limits.LimitSet, console bool, stdioFDs []int) (*kernel.FDMap, error) { +func createFDMap(ctx context.Context, l *limits.LimitSet, console bool, stdioFDs []int) (*kernel.FDMap, error) { if len(stdioFDs) != 3 { return nil, fmt.Errorf("stdioFDs should contain exactly 3 FDs (stdin, stdout, and stderr), but %d FDs received", len(stdioFDs)) } + k := kernel.KernelFromContext(ctx) fdm := k.NewFDMap() defer fdm.DecRef() mounter := fs.FileOwnerFromContext(ctx) |