fanotify: Fix for musl
PATCH 1/1 fanotify: Fix for musl
FSID_VAL_MEMBER() wrapper was meant to be only for struct fanotify_event_info_fid, it was used also for struct event_t (which has also __kernel_fsid_t fsid, but shouldn't be redefined).
This caused error on recent musl v1.1.23 (with f67b3c17), which has struct fanotify_event_info_fid.
fanotify_event_info_fid.fsid member")
---
Hi,
I'm sorry, one more error sneaked in.
I accidentally tested it on toolchains which has older musl release.
Helper should have obvious name to show it's just for fanotify_event_info_fid, but something like EVENT_INFO_FID_FSID_VAL_MEMBER() is too long. Posting just in case you prefer renaming (fanotify.h is getting a bit complicated).
NOTE: I also find in various uclibc arch dependent kernel_types.h headers libc/sysdeps/linux/x86_64/bits/kernel_types.h (19 of 29 archs) typedef struct {
#ifdef __USE_ALL int val[2]; #else int __val[2];
#endif
} __kernel_fsid_t;
which would suggest we need also detection and helper for general __kernel_fsid_t usage. But I'd ignore it unless anybody reports it's really needed. I haven't found whether __USE_ALL is set as default, but I expect it so.
Kind regards,
Petr
testcases/kernel/syscalls/fanotify/fanotify.h | 1 + testcases/kernel/syscalls/fanotify/fanotify13.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-)
testcases/kernel/syscalls/fanotify/fanotify.h +1 -0
@@ -143,6 +143,7 @@ struct fanotify_event_info_fid { };#endif /* HAVE_STRUCT_FANOTIFY_EVENT_INFO_FID */ +/* NOTE: only for struct fanotify_event_info_fid */ #ifdef HAVE_STRUCT_FANOTIFY_EVENT_INFO_FID_FSID___VAL # define FSID_VAL_MEMBER (fsid, i) (fsid.__val[i])#else
testcases/kernel/syscalls/fanotify/fanotify13.c +2 -2
@@ -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",
Signature · 1 line
2.24.0
PATCH 1/1 fanotify: Fix for musl
----- Original Message -----
Quoted 11 lines
FSID_VAL_MEMBER()wrapper was meant to be only for structfanotify_event_info_fid, it was used also for structevent_t(which has also__kernel_fsid_tfsid, but shouldn't be redefined).This caused error on recent musl v1.1.23 (with
f67b3c17), which has structfanotify_event_info_fid.Fixes 0498fc0a8 ("fanotify: Detect val vs. __valfanotify_event_info_fid.fsid member")
Signed-off-by Petr Vorel <[email protected]>
If it's needed for __kernel_fsid_t we'll need to come up with better names. This basically reverts part of previous patch, which looks ok to me.
PATCH 1/1 fanotify: Fix for musl
Hi Jan,
Quoted 8 lines
----- Original Message -----
Quoted 6 lines
FSID_VAL_MEMBER()wrapper was meant to be only for structfanotify_event_info_fid, it was used also for structevent_t(which has also__kernel_fsid_tfsid, but shouldn't be redefined).This caused error on recent musl v1.1.23 (with
f67b3c17), which has structfanotify_event_info_fid.
Quoted 6 lines
Quoted 4 lines
Fixes 0498fc0a8 ("fanotify: Detect val vs. __valfanotify_event_info_fid.fsid member")
Signed-off-by Petr Vorel <[email protected]>If it's needed for
__kernel_fsid_twe'll need to come up with better names.
+1. But hope this is not needed.
Quoted 1 line
This basically reverts part of previous patch, which looks ok to me.
Yep. I'll add this to commit message, to be obvious.
Quoted 1 line
Acked-by Jan Stancek <[email protected]>
Thanks for your review.
I'll wait with merge till Monday (if Cyril has some comments).
Kind regards,
Petr
PATCH 1/1 fanotify: Fix for musl
Hi,
Quoted 10 lines
Quoted 1 line
If it's needed for
__kernel_fsid_twe'll need to come up with better names.+1. But hope this is not needed.
Quoted 1 line
This basically reverts part of previous patch, which looks ok to me.
Yep. I'll add this to commit message, to be obvious.
Quoted 1 line
Acked-by Jan Stancek <[email protected]>Thanks for your review.
I'll wait with merge till Monday (if Cyril has some comments).
Merged.
Kind regards,
Petr