32 lines
1.1 KiB
Diff
32 lines
1.1 KiB
Diff
|
From 087e13ecb9eea6cbd920708e64eab18e7ab8a90c Mon Sep 17 00:00:00 2001
|
||
|
|
From: Petr Vorel <petr.vorel@gmail.com>
|
||
|
|
Date: Sat, 16 Nov 2019 00:14:42 +0100
|
||
|
|
Subject: [PATCH] fanotify: Fix for musl
|
||
|
|
|
||
|
|
Fixes: 0498fc0a8 ("fanotify: Detect val vs. __val fanotify_event_info_fid.fsid member")
|
||
|
|
|
||
|
|
[upstream status: https://patchwork.ozlabs.org/patch/1195915/]
|
||
|
|
Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
|
||
|
|
---
|
||
|
|
testcases/kernel/syscalls/fanotify/fanotify13.c | 4 ++--
|
||
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/testcases/kernel/syscalls/fanotify/fanotify13.c b/testcases/kernel/syscalls/fanotify/fanotify13.c
|
||
|
|
index 26212ab62..3d8de6009 100644
|
||
|
|
--- a/testcases/kernel/syscalls/fanotify/fanotify13.c
|
||
|
|
+++ b/testcases/kernel/syscalls/fanotify/fanotify13.c
|
||
|
|
@@ -130,8 +130,8 @@ static int setup_marks(unsigned int fd, struct test_case_t *tc)
|
||
|
|
"kernel");
|
||
|
|
return 1;
|
||
|
|
} else if (errno == ENODEV &&
|
||
|
|
- !FSID_VAL_MEMBER(event_set[i].fsid, 0) &&
|
||
|
|
- !FSID_VAL_MEMBER(event_set[i].fsid, 1)) {
|
||
|
|
+ !event_set[i].fsid.val[0] &&
|
||
|
|
+ !event_set[i].fsid.val[1]) {
|
||
|
|
tst_res(TCONF,
|
||
|
|
"FAN_REPORT_FID not supported on "
|
||
|
|
"filesystem type %s",
|
||
|
|
--
|
||
|
|
2.24.0
|
||
|
|
|