From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 7 Oct 2022 15:28:50 +0000 (-0700)
Subject: Merge tag 'fsnotify-for_v6.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v6.1-rc5~286
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=abf625dc8c1db167150c844028a2f9f4c329fe68;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'fsnotify-for_v6.1-rc1' of git://git./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
---

abf625dc8c1db167150c844028a2f9f4c329fe68
diff --cc fs/notify/fanotify/fanotify.h
index bf6d4d3,b34246c..57f51a9
--- a/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;