| Message ID | 20181003212539.2384-7-amir73il@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | New fanotify event info API | expand |
On Thu 04-10-18 00:25:37, Amir Goldstein wrote: > Also define the FANOTIFY_EVENT_FLAGS consisting of the extra flags > FAN_ONDIR and FAN_ON_CHILD. > > Signed-off-by: Amir Goldstein <amir73il@gmail.com> ... > /* Events that may be reported to user */ > #define FANOTIFY_OUTGOING_EVENTS (FANOTIFY_EVENTS | \ > FANOTIFY_PERM_EVENTS | \ > FAN_Q_OVERFLOW) > > +#define ALL_FANOTIFY_EVENT_BITS (FANOTIFY_EVENTS | \ > + FANOTIFY_PERM_EVENTS | \ > + FANOTIFY_EVENT_FLAGS | \ > + FANOTIFY_OUTGOING_EVENTS) > + No point in repeating FANOTIFY_EVENTS | FANOTIFY_PERM_EVENTS here when they are already included on FANOTIFY_OUTGOING_EVENTS, right? I can fix that up myself, just wanted to point it out. Honza
On Thu, Oct 4, 2018 at 11:41 AM Jan Kara <jack@suse.cz> wrote: > > On Thu 04-10-18 00:25:37, Amir Goldstein wrote: > > Also define the FANOTIFY_EVENT_FLAGS consisting of the extra flags > > FAN_ONDIR and FAN_ON_CHILD. > > > > Signed-off-by: Amir Goldstein <amir73il@gmail.com> > ... > > /* Events that may be reported to user */ > > #define FANOTIFY_OUTGOING_EVENTS (FANOTIFY_EVENTS | \ > > FANOTIFY_PERM_EVENTS | \ > > FAN_Q_OVERFLOW) > > > > +#define ALL_FANOTIFY_EVENT_BITS (FANOTIFY_EVENTS | \ > > + FANOTIFY_PERM_EVENTS | \ > > + FANOTIFY_EVENT_FLAGS | \ > > + FANOTIFY_OUTGOING_EVENTS) > > + > > No point in repeating FANOTIFY_EVENTS | FANOTIFY_PERM_EVENTS here when > they are already included on FANOTIFY_OUTGOING_EVENTS, right? I can fix > that up myself, just wanted to point it out. It's fine to me. Thanks, Amir.
diff --git a/fs/notify/fanotify/fanotify.c b/fs/notify/fanotify/fanotify.c index 03498eb995be..361e3a0a445c 100644 --- a/fs/notify/fanotify/fanotify.c +++ b/fs/notify/fanotify/fanotify.c @@ -205,6 +205,8 @@ static int fanotify_handle_event(struct fsnotify_group *group, BUILD_BUG_ON(FAN_ACCESS_PERM != FS_ACCESS_PERM); BUILD_BUG_ON(FAN_ONDIR != FS_ISDIR); + BUILD_BUG_ON(HWEIGHT32(ALL_FANOTIFY_EVENT_BITS) != 10); + if (!fanotify_should_send_event(iter_info, mask, data, data_type)) return 0; diff --git a/fs/notify/fanotify/fanotify_user.c b/fs/notify/fanotify/fanotify_user.c index 530e5e486105..14594e491d2b 100644 --- a/fs/notify/fanotify/fanotify_user.c +++ b/fs/notify/fanotify/fanotify_user.c @@ -803,7 +803,7 @@ static int do_fanotify_mark(int fanotify_fd, unsigned int flags, __u64 mask, struct fsnotify_group *group; struct fd f; struct path path; - u32 valid_mask = FANOTIFY_EVENTS | FAN_EVENT_ON_CHILD | FAN_ONDIR; + u32 valid_mask = FANOTIFY_EVENTS | FANOTIFY_EVENT_FLAGS; unsigned int mark_type = flags & FANOTIFY_MARK_TYPE_BITS; int ret; @@ -944,6 +944,9 @@ COMPAT_SYSCALL_DEFINE6(fanotify_mark, */ static int __init fanotify_user_setup(void) { + BUILD_BUG_ON(HWEIGHT32(FANOTIFY_INIT_FLAGS) != 6); + BUILD_BUG_ON(HWEIGHT32(FANOTIFY_MARK_FLAGS) != 9); + fanotify_mark_cache = KMEM_CACHE(fsnotify_mark, SLAB_PANIC|SLAB_ACCOUNT); fanotify_event_cachep = KMEM_CACHE(fanotify_event_info, SLAB_PANIC); diff --git a/include/linux/fanotify.h b/include/linux/fanotify.h index 4519b0988afe..afddd7e0d5a1 100644 --- a/include/linux/fanotify.h +++ b/include/linux/fanotify.h @@ -41,11 +41,19 @@ /* Events that require a permission response from user */ #define FANOTIFY_PERM_EVENTS (FAN_OPEN_PERM | FAN_ACCESS_PERM) +/* Extra flags that may be reported with event or control handling of events */ +#define FANOTIFY_EVENT_FLAGS (FAN_EVENT_ON_CHILD | FAN_ONDIR) + /* Events that may be reported to user */ #define FANOTIFY_OUTGOING_EVENTS (FANOTIFY_EVENTS | \ FANOTIFY_PERM_EVENTS | \ FAN_Q_OVERFLOW) +#define ALL_FANOTIFY_EVENT_BITS (FANOTIFY_EVENTS | \ + FANOTIFY_PERM_EVENTS | \ + FANOTIFY_EVENT_FLAGS | \ + FANOTIFY_OUTGOING_EVENTS) + /* Do not use these old uapi constants internally */ #undef FAN_ALL_CLASS_BITS #undef FAN_ALL_INIT_FLAGS
Also define the FANOTIFY_EVENT_FLAGS consisting of the extra flags FAN_ONDIR and FAN_ON_CHILD. Signed-off-by: Amir Goldstein <amir73il@gmail.com> --- fs/notify/fanotify/fanotify.c | 2 ++ fs/notify/fanotify/fanotify_user.c | 5 ++++- include/linux/fanotify.h | 8 ++++++++ 3 files changed, 14 insertions(+), 1 deletion(-)