diff options
| author | Miklos Szeredi <mszeredi@redhat.com> | 2017-10-30 21:14:56 +0100 |
|---|---|---|
| committer | Jan Kara <jack@suse.cz> | 2017-10-31 17:54:56 +0100 |
| commit | 6685df31255493c3f0e9e0b8bf885e4c9762fc5d (patch) | |
| tree | 2536e2f37ad5b265a77a5e4fe517743955a54cc0 /fs/notify/fanotify/fanotify.h | |
| parent | fsnotify: clean up fsnotify() (diff) | |
| download | linux-6685df31255493c3f0e9e0b8bf885e4c9762fc5d.tar.xz linux-6685df31255493c3f0e9e0b8bf885e4c9762fc5d.zip | |
fanotify: clean up CONFIG_FANOTIFY_ACCESS_PERMISSIONS ifdefs
The only negative from this patch should be an addition of 32bytes to
'struct fsnotify_group' if CONFIG_FANOTIFY_ACCESS_PERMISSIONS is not
defined.
Reviewed-by: Amir Goldstein <amir73il@gmail.com>
Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
Signed-off-by: Jan Kara <jack@suse.cz>
Diffstat (limited to 'fs/notify/fanotify/fanotify.h')
| -rw-r--r-- | fs/notify/fanotify/fanotify.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/fs/notify/fanotify/fanotify.h b/fs/notify/fanotify/fanotify.h index 4eb6f5efa282..dc219cf07a6a 100644 --- a/fs/notify/fanotify/fanotify.h +++ b/fs/notify/fanotify/fanotify.h @@ -21,7 +21,6 @@ struct fanotify_event_info { struct pid *tgid; }; -#ifdef CONFIG_FANOTIFY_ACCESS_PERMISSIONS /* * Structure for permission fanotify events. It gets allocated and freed in * fanotify_handle_event() since we wait there for user response. When the @@ -40,7 +39,12 @@ FANOTIFY_PE(struct fsnotify_event *fse) { return container_of(fse, struct fanotify_perm_event_info, fae.fse); } -#endif + +static inline bool fanotify_is_perm_event(u32 mask) +{ + return IS_ENABLED(CONFIG_FANOTIFY_ACCESS_PERMISSIONS) && + mask & FAN_ALL_PERM_EVENTS; +} static inline struct fanotify_event_info *FANOTIFY_E(struct fsnotify_event *fse) { |