summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-06-29 22:49:00 +0000
committergVisor bot <gvisor-bot@google.com>2020-06-29 22:49:00 +0000
commit73db7a4f42720430d8bd0a35a7cae04f43b4549d (patch)
tree3eba25a910b2e3c9617e1f999715098fd3ef135a
parent9e9a5f18d48dc0ca991f3950fd5349f12d84eee5 (diff)
parent5b0d8ff6919a071effb9cf69ad715487f55ca2f3 (diff)
Merge release-20200622.1-40-g5b0d8ff69 (automated)
-rw-r--r--pkg/abi/linux/linux_abi_autogen_unsafe.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/abi/linux/linux_abi_autogen_unsafe.go b/pkg/abi/linux/linux_abi_autogen_unsafe.go
index ac656f14c..655b4ee9c 100644
--- a/pkg/abi/linux/linux_abi_autogen_unsafe.go
+++ b/pkg/abi/linux/linux_abi_autogen_unsafe.go
@@ -129,7 +129,7 @@ func (s *Statx) Packed() bool {
// MarshalUnsafe implements marshal.Marshallable.MarshalUnsafe.
func (s *Statx) MarshalUnsafe(dst []byte) {
- if s.Atime.Packed() && s.Btime.Packed() && s.Ctime.Packed() && s.Mtime.Packed() {
+ if s.Mtime.Packed() && s.Atime.Packed() && s.Btime.Packed() && s.Ctime.Packed() {
safecopy.CopyIn(dst, unsafe.Pointer(s))
} else {
s.MarshalBytes(dst)