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/pod.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/pod.go')
| -rw-r--r-- | libpod/pod.go | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/libpod/pod.go b/libpod/pod.go index 07f41f5c6..4ce697402 100644 --- a/libpod/pod.go +++ b/libpod/pod.go @@ -3,7 +3,7 @@ package libpod import ( "time" - "github.com/containers/storage" + "github.com/containers/libpod/libpod/lock" "github.com/cri-o/ocicni/pkg/ocicni" "github.com/pkg/errors" ) @@ -26,7 +26,7 @@ type Pod struct { valid bool runtime *Runtime - lock storage.Locker + lock lock.Locker } // PodConfig represents a pod's static configuration @@ -60,6 +60,9 @@ type PodConfig struct { // Time pod was created CreatedTime time.Time `json:"created"` + + // ID of the pod's lock + LockID uint32 `json:"lockID"` } // podState represents a pod's state |