diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-10-07 08:28:50 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-10-07 08:28:50 -0700 |
| commit | abf625dc8c1db167150c844028a2f9f4c329fe68 (patch) | |
| tree | e828459ee449ac9282ff2319b498a4c8644ad7ad | |
| parent | 9f4b9beeb9cf46c4b172fca06de5bd6831108641 (diff) | |
| parent | 7a80bf902d2bc722b4477442ee772e8574603185 (diff) | |
| download | linux-stable-abf625dc8c1db167150c844028a2f9f4c329fe68.tar.gz linux-stable-abf625dc8c1db167150c844028a2f9f4c329fe68.tar.bz2 linux-stable-abf625dc8c1db167150c844028a2f9f4c329fe68.zip | |
Merge tag 'fsnotify-for_v6.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
Pull fsnotify updates from Jan Kara:
"Two cleanups for fsnotify code"
* tag 'fsnotify-for_v6.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
fanotify: Remove obsoleted fanotify_event_has_path()
fsnotify: remove unused declaration
| -rw-r--r-- | fs/notify/fanotify/fanotify.h | 6 | ||||
| -rw-r--r-- | fs/notify/fsnotify.h | 4 |
2 files changed, 0 insertions, 10 deletions
diff --git a/fs/notify/fanotify/fanotify.h b/fs/notify/fanotify/fanotify.h index bf6d4d38afa0..57f51a9a3015 100644 --- a/fs/notify/fanotify/fanotify.h +++ b/fs/notify/fanotify/fanotify.h @@ -452,12 +452,6 @@ static inline bool fanotify_is_error_event(u32 mask) return mask & FAN_FS_ERROR; } -static inline bool fanotify_event_has_path(struct fanotify_event *event) -{ - return event->type == FANOTIFY_EVENT_TYPE_PATH || - event->type == FANOTIFY_EVENT_TYPE_PATH_PERM; -} - static inline const struct path *fanotify_event_path(struct fanotify_event *event) { if (event->type == FANOTIFY_EVENT_TYPE_PATH) diff --git a/fs/notify/fsnotify.h b/fs/notify/fsnotify.h index 87d8a50ee803..fde74eb333cc 100644 --- a/fs/notify/fsnotify.h +++ b/fs/notify/fsnotify.h @@ -76,10 +76,6 @@ static inline void fsnotify_clear_marks_by_sb(struct super_block *sb) */ extern void __fsnotify_update_child_dentry_flags(struct inode *inode); -/* allocate and destroy and event holder to attach events to notification/access queues */ -extern struct fsnotify_event_holder *fsnotify_alloc_event_holder(void); -extern void fsnotify_destroy_event_holder(struct fsnotify_event_holder *holder); - extern struct kmem_cache *fsnotify_mark_connector_cachep; #endif /* __FS_NOTIFY_FSNOTIFY_H_ */ |