summaryrefslogtreecommitdiff
path: root/libpod/networking_linux.go
diff options
context:
space:
mode:
authorMatthew Heon <mheon@redhat.com>2022-02-22 11:05:26 -0500
committerMatthew Heon <mheon@redhat.com>2022-02-22 11:05:26 -0500
commit4a60319ecb833fd4afd4ef32b3ca49c377a94b5c (patch)
treef132003f65fee6e2178f96c8a289ee97a41dfe5b /libpod/networking_linux.go
parentfab82a7c9ca3821c2b4496f9e9f6bfc8b2aff53d (diff)
downloadpodman-4a60319ecb833fd4afd4ef32b3ca49c377a94b5c.tar.gz
podman-4a60319ecb833fd4afd4ef32b3ca49c377a94b5c.tar.bz2
podman-4a60319ecb833fd4afd4ef32b3ca49c377a94b5c.zip
Remove the runtime lock
This primarily served to protect us against shutting down the Libpod runtime while operations (like creating a container) were happening. However, it was very inconsistently implemented (a lot of our longer-lived functions, like pulling images, just didn't implement it at all...) and I'm not sure how much we really care about this very-specific error case? Removing it also removes a lot of potential deadlocks, which is nice. [NO NEW TESTS NEEDED] Signed-off-by: Matthew Heon <mheon@redhat.com>
Diffstat (limited to 'libpod/networking_linux.go')
-rw-r--r--libpod/networking_linux.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/libpod/networking_linux.go b/libpod/networking_linux.go
index 19d5c7f76..29b9941fe 100644
--- a/libpod/networking_linux.go
+++ b/libpod/networking_linux.go
@@ -320,7 +320,7 @@ func (r *RootlessNetNS) Cleanup(runtime *Runtime) error {
// only if the netns is empty we know that we do not need cleanup
return c.state.NetNS != nil
}
- ctrs, err := runtime.GetContainersWithoutLock(activeNetns)
+ ctrs, err := runtime.GetContainers(activeNetns)
if err != nil {
return err
}