From e395d2dc50fd8e3fef9676dbb5ede2ee7ac6215a Mon Sep 17 00:00:00 2001 From: Kir Kolyshkin Date: Tue, 5 Oct 2021 19:19:40 -0700 Subject: [PATCH] libct: Init: remove LockOSThread This call is already made in init.go, no need for a duplicate. Signed-off-by: Kir Kolyshkin --- libcontainer/setns_init_linux.go | 4 ---- libcontainer/standard_init_linux.go | 3 --- 2 files changed, 7 deletions(-) diff --git a/libcontainer/setns_init_linux.go b/libcontainer/setns_init_linux.go index a2c9efc4f..09ab552b3 100644 --- a/libcontainer/setns_init_linux.go +++ b/libcontainer/setns_init_linux.go @@ -4,7 +4,6 @@ import ( "errors" "fmt" "os" - "runtime" "strconv" "github.com/opencontainers/selinux/go-selinux" @@ -31,9 +30,6 @@ func (l *linuxSetnsInit) getSessionRingName() string { } func (l *linuxSetnsInit) Init() error { - runtime.LockOSThread() - defer runtime.UnlockOSThread() - if !l.config.Config.NoNewKeyring { if err := selinux.SetKeyLabel(l.config.ProcessLabel); err != nil { return err diff --git a/libcontainer/standard_init_linux.go b/libcontainer/standard_init_linux.go index 6dfea9998..ccc2eb10a 100644 --- a/libcontainer/standard_init_linux.go +++ b/libcontainer/standard_init_linux.go @@ -5,7 +5,6 @@ import ( "fmt" "os" "os/exec" - "runtime" "strconv" "github.com/opencontainers/runtime-spec/specs-go" @@ -46,8 +45,6 @@ func (l *linuxStandardInit) getSessionRingParams() (string, uint32, uint32) { } func (l *linuxStandardInit) Init() error { - runtime.LockOSThread() - defer runtime.UnlockOSThread() if !l.config.Config.NoNewKeyring { if err := selinux.SetKeyLabel(l.config.ProcessLabel); err != nil { return err