From f4cd59a59b8570dcad3f77b523f7cbb37121f96e Mon Sep 17 00:00:00 2001 From: "Dmitry V. Levin" Date: Tue, 21 May 2019 23:30:35 +0000 Subject: [PATCH] xlat: update FAN_* constants * xlat/fan_mark_flags.in (FAN_MARK_FILESYSTEM): New constant introduced by Linux kernel commit v4.20-rc1~75^2~10. * tests/fanotify_mark.c (main): Update expected output. --- tests/fanotify_mark.c | 15 ++++++++------- xlat/fan_mark_flags.in | 1 + 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/tests/fanotify_mark.c b/tests/fanotify_mark.c index 10a8e5ff..33d18253 100644 --- a/tests/fanotify_mark.c +++ b/tests/fanotify_mark.c @@ -90,8 +90,8 @@ main(void) }; static const struct strval flags[] = { { F8ILL_KULONG_MASK, "0" }, - { (kernel_ulong_t) 0xdec0deddefaced00ULL, - "0xefaced00" + { (kernel_ulong_t) 0xdec0deddefacec00ULL, + "0xefacec00" # if !XLAT_RAW " /* FAN_MARK_??? */" # endif @@ -105,17 +105,18 @@ main(void) "FAN_MARK_IGNORED_SURV_MODIFY" # endif }, - { (kernel_ulong_t) 0xbadc0deddeadfeedULL, + { (kernel_ulong_t) 0xbadc0deddeadffffULL, # if XLAT_RAW || XLAT_VERBOSE - "0xdeadfeed" + "0xdeadffff" # endif # if XLAT_VERBOSE " /* " # endif # if !XLAT_RAW - "FAN_MARK_ADD|FAN_MARK_DONT_FOLLOW|FAN_MARK_ONLYDIR|" - "FAN_MARK_IGNORED_MASK|FAN_MARK_IGNORED_SURV_MODIFY|" - "FAN_MARK_FLUSH|0xdeadfe00" + "FAN_MARK_ADD|FAN_MARK_REMOVE|FAN_MARK_DONT_FOLLOW|" + "FAN_MARK_ONLYDIR|FAN_MARK_MOUNT|FAN_MARK_IGNORED_MASK|" + "FAN_MARK_IGNORED_SURV_MODIFY|FAN_MARK_FLUSH|" + "FAN_MARK_FILESYSTEM|0xdeadfe00" # endif # if XLAT_VERBOSE " */" diff --git a/xlat/fan_mark_flags.in b/xlat/fan_mark_flags.in index 134af4b2..56cd8e58 100644 --- a/xlat/fan_mark_flags.in +++ b/xlat/fan_mark_flags.in @@ -6,3 +6,4 @@ FAN_MARK_MOUNT 0x00000010 FAN_MARK_IGNORED_MASK 0x00000020 FAN_MARK_IGNORED_SURV_MODIFY 0x00000040 FAN_MARK_FLUSH 0x00000080 +FAN_MARK_FILESYSTEM 0x00000100 -- 2.40.0