diff options
| author | gVisor bot <gvisor-bot@google.com> | 2021-01-22 22:11:33 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2021-01-22 22:11:33 +0000 |
| commit | d7cb3d3676d4abb1e4a434ec34e8562f923f1e86 (patch) | |
| tree | 5a548b49829108b877b3cab2b0d0d2d65fac6b77 /pkg/abi | |
| parent | 993bee6697b0e371d902f18b81787c14d12180f5 (diff) | |
| parent | f52f0101bb651924b404e7843b1e383b6845a107 (diff) | |
Merge release-20210112.0-75-gf52f0101b (automated)
Diffstat (limited to 'pkg/abi')
| -rw-r--r-- | pkg/abi/linux/fcntl.go | 3 | ||||
| -rw-r--r-- | pkg/abi/linux/linux_abi_autogen_unsafe.go | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/pkg/abi/linux/fcntl.go b/pkg/abi/linux/fcntl.go index d1ca56370..b84d7c048 100644 --- a/pkg/abi/linux/fcntl.go +++ b/pkg/abi/linux/fcntl.go @@ -21,6 +21,7 @@ const ( F_SETFD = 2 F_GETFL = 3 F_SETFL = 4 + F_GETLK = 5 F_SETLK = 6 F_SETLKW = 7 F_SETOWN = 8 @@ -55,7 +56,7 @@ type Flock struct { _ [4]byte Start int64 Len int64 - Pid int32 + PID int32 _ [4]byte } diff --git a/pkg/abi/linux/linux_abi_autogen_unsafe.go b/pkg/abi/linux/linux_abi_autogen_unsafe.go index 7d571c7a7..4960295ae 100644 --- a/pkg/abi/linux/linux_abi_autogen_unsafe.go +++ b/pkg/abi/linux/linux_abi_autogen_unsafe.go @@ -1284,7 +1284,7 @@ func (f *Flock) MarshalBytes(dst []byte) { dst = dst[8:] usermem.ByteOrder.PutUint64(dst[:8], uint64(f.Len)) dst = dst[8:] - usermem.ByteOrder.PutUint32(dst[:4], uint32(f.Pid)) + usermem.ByteOrder.PutUint32(dst[:4], uint32(f.PID)) dst = dst[4:] // Padding: dst[:sizeof(byte)*4] ~= [4]byte{0} dst = dst[1*(4):] @@ -1302,7 +1302,7 @@ func (f *Flock) UnmarshalBytes(src []byte) { src = src[8:] f.Len = int64(usermem.ByteOrder.Uint64(src[:8])) src = src[8:] - f.Pid = int32(usermem.ByteOrder.Uint32(src[:4])) + f.PID = int32(usermem.ByteOrder.Uint32(src[:4])) src = src[4:] // Padding: ~ copy([4]byte(f._), src[:sizeof(byte)*4]) src = src[1*(4):] |