From 2c42eef0765b9837fbdab12011af7830f55f88f0 Mon Sep 17 00:00:00 2001 From: Ryan Zhang Date: Tue, 16 Jan 2018 11:39:04 -0800 Subject: [PATCH] unix: adjust replacement regex for removed struct fields for linux/s390x CL 87555 added the AT_STATX_* constants which are garbled on linux/s390x due to the replacement regex in mkpost.go being too broad. Adjust the regex to only match on word boundaries. Change-Id: I898547fbbbc5d02965e86300e9144fb65207ab33 Reviewed-on: https://go-review.googlesource.com/87876 Reviewed-by: Tobias Klauser Run-TryBot: Tobias Klauser TryBot-Result: Gobot Gobot --- unix/mkpost.go | 2 +- unix/ztypes_linux_s390x.go | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/unix/mkpost.go b/unix/mkpost.go index 4c191f01..ca6b431c 100644 --- a/unix/mkpost.go +++ b/unix/mkpost.go @@ -72,7 +72,7 @@ func main() { b = removeFieldsRegex.ReplaceAll(b, []byte("_")) // Remove padding, hidden, or unused fields - removeFieldsRegex = regexp.MustCompile(`X_\S+`) + removeFieldsRegex = regexp.MustCompile(`\bX_\S+`) b = removeFieldsRegex.ReplaceAll(b, []byte("_")) } diff --git a/unix/ztypes_linux_s390x.go b/unix/ztypes_linux_s390x.go index c064b3b1..8f4edcde 100644 --- a/unix/ztypes_linux_s390x.go +++ b/unix/ztypes_linux_s390x.go @@ -702,9 +702,9 @@ const ( AT_NO_AUTOMOUNT = 0x800 AT_REMOVEDIR = 0x200 - AT_STAT_ = 0x0 - AT_STAT_ = 0x2000 - AT_STAT_ = 0x4000 + AT_STATX_SYNC_AS_STAT = 0x0 + AT_STATX_FORCE_SYNC = 0x2000 + AT_STATX_DONT_SYNC = 0x4000 AT_SYMLINK_FOLLOW = 0x400 AT_SYMLINK_NOFOLLOW = 0x100