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
This commit is contained in:
Linus Torvalds 2022-10-07 08:28:50 -07:00
commit abf625dc8c
2 changed files with 0 additions and 10 deletions

View File

@ -452,12 +452,6 @@ static inline bool fanotify_is_error_event(u32 mask)
return mask & FAN_FS_ERROR; 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) static inline const struct path *fanotify_event_path(struct fanotify_event *event)
{ {
if (event->type == FANOTIFY_EVENT_TYPE_PATH) if (event->type == FANOTIFY_EVENT_TYPE_PATH)

View File

@ -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); 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; extern struct kmem_cache *fsnotify_mark_connector_cachep;
#endif /* __FS_NOTIFY_FSNOTIFY_H_ */ #endif /* __FS_NOTIFY_FSNOTIFY_H_ */