diff options
| author | Matthew Heon <matthew.heon@pm.me> | 2019-01-10 15:40:56 -0500 |
|---|---|---|
| committer | Matthew Heon <matthew.heon@pm.me> | 2019-01-10 15:41:19 -0500 |
| commit | 76c57f55cacb7916ca451e378d181b1c30c94032 (patch) | |
| tree | 775fafbd2dcefae1b1731744219dc2410e985800 /libpod/pod.go | |
| parent | 6e8aeab472154e2b1eff92683803d16af06d2b30 (diff) | |
| download | podman-76c57f55cacb7916ca451e378d181b1c30c94032.tar.gz podman-76c57f55cacb7916ca451e378d181b1c30c94032.tar.bz2 podman-76c57f55cacb7916ca451e378d181b1c30c94032.zip | |
Revert "Merge pull request #1235 from mheon/shm_locking"
This reverts commit bf5f779331870d31863c486619daae3fcea458eb, reversing
changes made to 6868b5aa1444404113bc6a4582203fbbf89490c2.
Signed-off-by: Matthew Heon <matthew.heon@pm.me>
Diffstat (limited to 'libpod/pod.go')
| -rw-r--r-- | libpod/pod.go | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/libpod/pod.go b/libpod/pod.go index 4ce697402..07f41f5c6 100644 --- a/libpod/pod.go +++ b/libpod/pod.go @@ -3,7 +3,7 @@ package libpod import ( "time" - "github.com/containers/libpod/libpod/lock" + "github.com/containers/storage" "github.com/cri-o/ocicni/pkg/ocicni" "github.com/pkg/errors" ) @@ -26,7 +26,7 @@ type Pod struct { valid bool runtime *Runtime - lock lock.Locker + lock storage.Locker } // PodConfig represents a pod's static configuration @@ -60,9 +60,6 @@ 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 |