Merge tag 'fsnotify-for_v6.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

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

diff --cc fs/notify/fanotify/fanotify.h
index bf6d4d38afa04bf05dc47b300d0b60644cff7619,b34246c6ec87e9c9b1b21d57a3f35edd7fa5a90f..57f51a9a3015d5c2d1c652e95b1216b1462574c0
--- 1/fs/notify/fanotify/fanotify.h
--- 2/fs/notify/fanotify/fanotify.h
+++ b/fs/notify/fanotify/fanotify.h
@@@ -452,13 -452,7 +452,7 @@@ static inline bool fanotify_is_error_ev
        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 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)
                return &FANOTIFY_PE(event)->path;