From db4ad6a7f118d122a5ee9a2696fa977b90ece27b Mon Sep 17 00:00:00 2001 From: Kir Kolyshkin Date: Thu, 11 Nov 2021 19:57:56 -0800 Subject: [PATCH] libcontainer/system: rm Prlimit It is now available from golang.org/x/sys/unix (https://go-review.googlesource.com/c/sys/+/332029) Signed-off-by: Kir Kolyshkin --- libcontainer/init_linux.go | 2 +- libcontainer/system/linux.go | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/libcontainer/init_linux.go b/libcontainer/init_linux.go index 935b7356c..806bec103 100644 --- a/libcontainer/init_linux.go +++ b/libcontainer/init_linux.go @@ -492,7 +492,7 @@ func setupRoute(config *configs.Config) error { func setupRlimits(limits []configs.Rlimit, pid int) error { for _, rlimit := range limits { - if err := system.Prlimit(pid, rlimit.Type, unix.Rlimit{Max: rlimit.Hard, Cur: rlimit.Soft}); err != nil { + if err := unix.Prlimit(pid, rlimit.Type, &unix.Rlimit{Max: rlimit.Hard, Cur: rlimit.Soft}, nil); err != nil { return fmt.Errorf("error setting rlimit type %v: %w", rlimit.Type, err) } } diff --git a/libcontainer/system/linux.go b/libcontainer/system/linux.go index 6701b5ea2..e1d6eb180 100644 --- a/libcontainer/system/linux.go +++ b/libcontainer/system/linux.go @@ -49,14 +49,6 @@ func Exec(cmd string, args []string, env []string) error { } } -func Prlimit(pid, resource int, limit unix.Rlimit) error { - _, _, err := unix.RawSyscall6(unix.SYS_PRLIMIT64, uintptr(pid), uintptr(resource), uintptr(unsafe.Pointer(&limit)), uintptr(unsafe.Pointer(&limit)), 0, 0) - if err != 0 { - return err - } - return nil -} - func SetParentDeathSignal(sig uintptr) error { if err := unix.Prctl(unix.PR_SET_PDEATHSIG, sig, 0, 0, 0); err != nil { return err