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_easyjson.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_easyjson.go')
| -rw-r--r-- | libpod/pod_easyjson.go | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/libpod/pod_easyjson.go b/libpod/pod_easyjson.go index 71862dad0..8ea9a5e72 100644 --- a/libpod/pod_easyjson.go +++ b/libpod/pod_easyjson.go @@ -501,8 +501,6 @@ func easyjsonBe091417DecodeGithubComContainersLibpodLibpod4(in *jlexer.Lexer, ou if data := in.Raw(); in.Ok() { in.AddError((out.CreatedTime).UnmarshalJSON(data)) } - case "lockID": - out.LockID = uint32(in.Uint32()) default: in.SkipRecursive() } @@ -677,16 +675,6 @@ func easyjsonBe091417EncodeGithubComContainersLibpodLibpod4(out *jwriter.Writer, } out.Raw((in.CreatedTime).MarshalJSON()) } - { - const prefix string = ",\"lockID\":" - if first { - first = false - out.RawString(prefix[1:]) - } else { - out.RawString(prefix) - } - out.Uint32(uint32(in.LockID)) - } out.RawByte('}') } |