diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-01-04 10:41:05 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-04 10:41:05 -0800 |
| commit | bf5f779331870d31863c486619daae3fcea458eb (patch) | |
| tree | aafcacc17883a8df4734bed0aadbaca59a9882fe /libpod/volume.go | |
| parent | 6868b5aa1444404113bc6a4582203fbbf89490c2 (diff) | |
| parent | 56c5c89408f89fc3733692786d66eb44133b2c59 (diff) | |
| download | podman-bf5f779331870d31863c486619daae3fcea458eb.tar.gz podman-bf5f779331870d31863c486619daae3fcea458eb.tar.bz2 podman-bf5f779331870d31863c486619daae3fcea458eb.zip | |
Merge pull request #1235 from mheon/shm_locking
SHM locking for Libpod
Diffstat (limited to 'libpod/volume.go')
| -rw-r--r-- | libpod/volume.go | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/libpod/volume.go b/libpod/volume.go index b732e8aa7..026a3bf49 100644 --- a/libpod/volume.go +++ b/libpod/volume.go @@ -1,6 +1,6 @@ package libpod -import "github.com/containers/storage" +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 @@ -9,13 +9,17 @@ type Volume struct { valid bool runtime *Runtime - lock storage.Locker + lock lock.Locker } // VolumeConfig holds the volume's config information //easyjson:json type VolumeConfig struct { - Name string `json:"name"` + // 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"` Driver string `json:"driver"` |