summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry V. Levin <ldv@altlinux.org>2020-06-29 08:00:00 +0000
committerDmitry V. Levin <ldv@altlinux.org>2020-06-29 08:00:00 +0000
commitc1d6727d5d4c5a8e8e6a5247c9a65399f393fcfe (patch)
tree6b9a8a53b6284d956bec9c7bb1731bde94bfeb6a
parent6d09db7c807efd4bfa74d1c524c584ddbd1d1eaf (diff)
downloadstrace-c1d6727d5d4c5a8e8e6a5247c9a65399f393fcfe.tar.gz
xlat: update STATX_* constants
* xlat/statx_attrs.in (STATX_ATTR_MOUNT_ROOT): New constant introduced by Linux kernel commit v5.8-rc1~203^2~4. * xlat/statx_masks.in (STATX_MNT_ID): New constant introduced by Linux kernel commit v5.8-rc1~203^2~5. * NEWS: Mention this change. * tests/xstatx.c (main): Update expected output.
-rw-r--r--NEWS3
-rw-r--r--tests/xstatx.c4
-rw-r--r--xlat/statx_attrs.in1
-rw-r--r--xlat/statx_masks.in1
4 files changed, 6 insertions, 3 deletions
diff --git a/NEWS b/NEWS
index b4bcb3861..85b2d3473 100644
--- a/NEWS
+++ b/NEWS
@@ -9,7 +9,8 @@ Noteworthy changes in release ?.? (????-??-??)
* Improvements
* Updated lists of AUDIT_*, CAP_*, ETH_*, INET_DIAG_*, IORING_*,
- KEYCTL_*, KVM_*, LOOP_*, NDA_*, RTC_*, TCA_*, and *_MAGIC constants.
+ KEYCTL_*, KVM_*, LOOP_*, NDA_*, RTC_*, TCA_*, STATX_*, and *_MAGIC
+ constants.
* Bug fixes
* Added statx syscall to %fstat trace class.
diff --git a/tests/xstatx.c b/tests/xstatx.c
index 1a1a8507f..6cefed1c0 100644
--- a/tests/xstatx.c
+++ b/tests/xstatx.c
@@ -468,12 +468,12 @@ main(void)
TEST_SYSCALL_STATX_FLAGS_STR = old_flags_str;
SET_MASK_INVOKE(0, "0");
- SET_MASK_INVOKE(0xfffff000U, "0xfffff000 /* STATX_??? */");
+ SET_MASK_INVOKE(0xffffe000U, "0xffffe000 /* STATX_??? */");
SET_MASK_INVOKE(0xfffffffbU,
"STATX_TYPE|STATX_MODE|STATX_UID|STATX_GID|STATX_ATIME|"
"STATX_MTIME|STATX_CTIME|STATX_INO|STATX_SIZE|STATX_BLOCKS|"
- "STATX_BTIME|0xfffff000");
+ "STATX_BTIME|STATX_MNT_ID|0xffffe000");
SET_MASK_INVOKE(STATX_UID, "STATX_UID");
diff --git a/xlat/statx_attrs.in b/xlat/statx_attrs.in
index 9dfa3379e..3fc5e37e1 100644
--- a/xlat/statx_attrs.in
+++ b/xlat/statx_attrs.in
@@ -4,4 +4,5 @@ STATX_ATTR_APPEND 0x00000020
STATX_ATTR_NODUMP 0x00000040
STATX_ATTR_ENCRYPTED 0x00000800
STATX_ATTR_AUTOMOUNT 0x00001000
+STATX_ATTR_MOUNT_ROOT 0x00002000
STATX_ATTR_VERITY 0x00100000
diff --git a/xlat/statx_masks.in b/xlat/statx_masks.in
index d18dd2592..3438672bb 100644
--- a/xlat/statx_masks.in
+++ b/xlat/statx_masks.in
@@ -13,3 +13,4 @@ STATX_INO 0x00000100U
STATX_SIZE 0x00000200U
STATX_BLOCKS 0x00000400U
STATX_BTIME 0x00000800U
+STATX_MNT_ID 0x00001000U