Commit abf625dc authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 9f4b9bee 7a80bf90

fs/notify/fanotify/fanotify.h

+0 −6
Original line number Diff line number Diff line
@@ -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)

fs/notify/fsnotify.h

+0 −4
Original line number Diff line number Diff line
@@ -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_ */