From 1068536e511a86bc02332d37a821642e54ae8f6e Mon Sep 17 00:00:00 2001 From: "Dmitry V. Levin" Date: Mon, 24 Jun 2019 16:57:01 +0000 Subject: [PATCH] xlat: update AT_* constants * xlat/at_flags.in (AT_RECURSIVE): New constant introduced by Linux kernel commit v5.2-rc1~141^2~9. * NEWS: Mention this. * tests/linkat.c: Update expected output. * tests/unlinkat.c: Update expected output. * tests/utimensat.c: Update expected output. * tests/xstatx.c: Update expected output. --- NEWS | 2 +- tests/linkat.c | 2 +- tests/unlinkat.c | 2 +- tests/utimensat.c | 4 ++-- tests/xstatx.c | 2 +- xlat/at_flags.in | 1 + 6 files changed, 7 insertions(+), 6 deletions(-) diff --git a/NEWS b/NEWS index 22a00f80..e941627d 100644 --- a/NEWS +++ b/NEWS @@ -3,7 +3,7 @@ Noteworthy changes in release ?.? (????-??-??) * Improvements * Enhanced decoding of clone syscall. - * Updated lists of AUDIT_*, CLONE_*, ETH_*, KEY_*, KVM_*, TIPC_*, + * Updated lists of AT_*, AUDIT_*, CLONE_*, ETH_*, KEY_*, KVM_*, TIPC_*, and V4L2_* constants. Noteworthy changes in release 5.1 (2019-05-22) diff --git a/tests/linkat.c b/tests/linkat.c index 748ddf18..a1b9c2e5 100644 --- a/tests/linkat.c +++ b/tests/linkat.c @@ -30,7 +30,7 @@ main(void) printf("linkat(%s, \"%s\", %s, \"%s\", %s) = %ld %s (%m)\n", "AT_FDCWD", sample_1, "AT_FDCWD", sample_2, "AT_SYMLINK_NOFOLLOW|AT_REMOVEDIR|AT_SYMLINK_FOLLOW" - "|AT_NO_AUTOMOUNT|AT_EMPTY_PATH|0xffffe0ff", + "|AT_NO_AUTOMOUNT|AT_EMPTY_PATH|AT_RECURSIVE|0xffff60ff", rc, errno2name()); puts("+++ exited with 0 +++"); diff --git a/tests/unlinkat.c b/tests/unlinkat.c index 0ae67964..a0bf1d62 100644 --- a/tests/unlinkat.c +++ b/tests/unlinkat.c @@ -27,7 +27,7 @@ main(void) printf("unlinkat(%s, \"%s\", %s) = %ld %s (%m)\n", "AT_FDCWD", sample, "AT_SYMLINK_NOFOLLOW|AT_REMOVEDIR|AT_SYMLINK_FOLLOW" - "|AT_NO_AUTOMOUNT|AT_EMPTY_PATH|0xffffe0ff", + "|AT_NO_AUTOMOUNT|AT_EMPTY_PATH|AT_RECURSIVE|0xffff60ff", rc, errno2name()); puts("+++ exited with 0 +++"); diff --git a/tests/utimensat.c b/tests/utimensat.c index 170b2c89..163b561b 100644 --- a/tests/utimensat.c +++ b/tests/utimensat.c @@ -44,7 +44,7 @@ "0x600 /* AT_REMOVEDIR|AT_SYMLINK_FOLLOW */" # define str_flags2 \ "0xffffffff /* AT_SYMLINK_NOFOLLOW|AT_REMOVEDIR|AT_SYMLINK_FOLLOW" \ - "|AT_NO_AUTOMOUNT|AT_EMPTY_PATH|0xffffe0ff */" + "|AT_NO_AUTOMOUNT|AT_EMPTY_PATH|AT_RECURSIVE|0xffff60ff */" # define str_utime_now_omit \ "[{tv_sec=" big_tv_sec ", tv_nsec=1073741823} /* UTIME_NOW */, " \ "{tv_sec=" huge_tv_sec ", tv_nsec=1073741822} /* UTIME_OMIT */]" @@ -55,7 +55,7 @@ # define str_flags1 "AT_REMOVEDIR|AT_SYMLINK_FOLLOW" # define str_flags2 \ "AT_SYMLINK_NOFOLLOW|AT_REMOVEDIR|AT_SYMLINK_FOLLOW" \ - "|AT_NO_AUTOMOUNT|AT_EMPTY_PATH|0xffffe0ff" + "|AT_NO_AUTOMOUNT|AT_EMPTY_PATH|AT_RECURSIVE|0xffff60ff" # define str_utime_now_omit "[UTIME_NOW, UTIME_OMIT]" # endif diff --git a/tests/xstatx.c b/tests/xstatx.c index 0d223bdc..6e14f3ad 100644 --- a/tests/xstatx.c +++ b/tests/xstatx.c @@ -460,7 +460,7 @@ main(void) SET_FLAGS_INVOKE(0xffffff, "AT_STATX_FORCE_SYNC|AT_STATX_DONT_SYNC|AT_SYMLINK_NOFOLLOW|" "AT_REMOVEDIR|AT_SYMLINK_FOLLOW|AT_NO_AUTOMOUNT|AT_EMPTY_PATH|" - "0xff80ff"); + "AT_RECURSIVE|0xff00ff"); /* We're done playing with flags. */ TEST_SYSCALL_STATX_FLAGS = old_flags; diff --git a/xlat/at_flags.in b/xlat/at_flags.in index 77a8de9b..6fe23892 100644 --- a/xlat/at_flags.in +++ b/xlat/at_flags.in @@ -3,3 +3,4 @@ AT_REMOVEDIR 0x200 AT_SYMLINK_FOLLOW 0x400 AT_NO_AUTOMOUNT 0x800 AT_EMPTY_PATH 0x1000 +AT_RECURSIVE 0x8000 -- 2.40.0