diff options
author | Matthew Heon <matthew.heon@pm.me> | 2019-02-15 09:34:37 -0500 |
---|---|---|
committer | Matthew Heon <matthew.heon@pm.me> | 2019-02-21 10:51:42 -0500 |
commit | ca8ae877c12cbfa368d572ef6700d9e4a23d5b11 (patch) | |
tree | ff88667c11ccf69576a85fbccffab68fbc95b326 /libpod/volume.go | |
parent | 9353a3e8ec3855f29c552dd1e0134dbaa3031efa (diff) | |
download | podman-ca8ae877c12cbfa368d572ef6700d9e4a23d5b11.tar.gz podman-ca8ae877c12cbfa368d572ef6700d9e4a23d5b11.tar.bz2 podman-ca8ae877c12cbfa368d572ef6700d9e4a23d5b11.zip |
Remove locks from volumes
I was looking into why we have locks in volumes, and I'm fairly
convinced they're unnecessary.
We don't have a state whose accesses we need to guard with locks
and syncs. The only real purpose for the lock was to prevent
concurrent removal of the same volume.
Looking at the code, concurrent removal ought to be fine with a
bit of reordering - one or the other might fail, but we will
successfully evict the volume from the state.
Also, remove the 'prune' bool from RemoveVolume. None of our
other API functions accept it, and it only served to toggle off
more verbose error messages.
Signed-off-by: Matthew Heon <matthew.heon@pm.me>
Diffstat (limited to 'libpod/volume.go')
-rw-r--r-- | libpod/volume.go | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/libpod/volume.go b/libpod/volume.go index 026a3bf49..74878b6a4 100644 --- a/libpod/volume.go +++ b/libpod/volume.go @@ -1,7 +1,5 @@ package libpod -import "github.com/containers/libpod/libpod/lock" - // Volume is the type used to create named volumes // TODO: all volumes should be created using this and the Volume API type Volume struct { @@ -9,7 +7,6 @@ type Volume struct { valid bool runtime *Runtime - lock lock.Locker } // VolumeConfig holds the volume's config information @@ -17,8 +14,6 @@ type Volume struct { type VolumeConfig struct { // Name of the volume Name string `json:"name"` - // ID of this volume's lock - LockID uint32 `json:"lockID"` Labels map[string]string `json:"labels"` MountPoint string `json:"mountPoint"` |