Skip to content

Commit abf625d

Browse files
committed
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
2 parents 9f4b9be + 7a80bf9 commit abf625d

File tree

2 files changed

+0
-10
lines changed

2 files changed

+0
-10
lines changed

fs/notify/fanotify/fanotify.h

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -452,12 +452,6 @@ static inline bool fanotify_is_error_event(u32 mask)
452452
return mask & FAN_FS_ERROR;
453453
}
454454

455-
static inline bool fanotify_event_has_path(struct fanotify_event *event)
456-
{
457-
return event->type == FANOTIFY_EVENT_TYPE_PATH ||
458-
event->type == FANOTIFY_EVENT_TYPE_PATH_PERM;
459-
}
460-
461455
static inline const struct path *fanotify_event_path(struct fanotify_event *event)
462456
{
463457
if (event->type == FANOTIFY_EVENT_TYPE_PATH)

fs/notify/fsnotify.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,10 +76,6 @@ static inline void fsnotify_clear_marks_by_sb(struct super_block *sb)
7676
*/
7777
extern void __fsnotify_update_child_dentry_flags(struct inode *inode);
7878

79-
/* allocate and destroy and event holder to attach events to notification/access queues */
80-
extern struct fsnotify_event_holder *fsnotify_alloc_event_holder(void);
81-
extern void fsnotify_destroy_event_holder(struct fsnotify_event_holder *holder);
82-
8379
extern struct kmem_cache *fsnotify_mark_connector_cachep;
8480

8581
#endif /* __FS_NOTIFY_FSNOTIFY_H_ */

0 commit comments

Comments
 (0)