Merge tag 'fsnotify_for_v5.2-rc1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel...

Pull fsnotify fixes from Jan Kara:
 "Two fsnotify fixes"

* tag 'fsnotify_for_v5.2-rc1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
  fsnotify: fix unlink performance regression
  fsnotify: Clarify connector assignment in fsnotify_add_mark_list()

diff --cc fs/notify/fsnotify.c
index 5433e37,e8d3f34..8c7cbac
--- 1/fs/notify/fsnotify.c
--- 2/fs/notify/fsnotify.c
+++ b/fs/notify/fsnotify.c
@@@ -107,6 -107,47 +107,47 @@@ void fsnotify_sb_delete(struct super_bl
        fsnotify_clear_marks_by_sb(sb);
  }
  
 -               name.name, 0);
+ /*
+  * fsnotify_nameremove - a filename was removed from a directory
+  *
+  * This is mostly called under parent vfs inode lock so name and
+  * dentry->d_parent should be stable. However there are some corner cases where
+  * inode lock is not held. So to be on the safe side and be reselient to future
+  * callers and out of tree users of d_delete(), we do not assume that d_parent
+  * and d_name are stable and we use dget_parent() and
+  * take_dentry_name_snapshot() to grab stable references.
+  */
+ void fsnotify_nameremove(struct dentry *dentry, int isdir)
+ {
+       struct dentry *parent;
+       struct name_snapshot name;
+       __u32 mask = FS_DELETE;
+ 
+       /* d_delete() of pseudo inode? (e.g. __ns_get_path() playing tricks) */
+       if (IS_ROOT(dentry))
+               return;
+ 
+       if (isdir)
+               mask |= FS_ISDIR;
+ 
+       parent = dget_parent(dentry);
+       /* Avoid unneeded take_dentry_name_snapshot() */
+       if (!(d_inode(parent)->i_fsnotify_mask & FS_DELETE) &&
+           !(dentry->d_sb->s_fsnotify_mask & FS_DELETE))
+               goto out_dput;
+ 
+       take_dentry_name_snapshot(&name, dentry);
+ 
+       fsnotify(d_inode(parent), mask, d_inode(dentry), FSNOTIFY_EVENT_INODE,
++               &name.name, 0);
+ 
+       release_dentry_name_snapshot(&name);
+ 
+ out_dput:
+       dput(parent);
+ }
+ EXPORT_SYMBOL(fsnotify_nameremove);
+ 
  /*
   * Given an inode, first check if we care what happens to our children.  Inotify
   * and dnotify both tell their parents about events.  If we care about any event

diff --cc include/linux/fsnotify.h
Simple merge

diff --cc include/linux/fsnotify_backend.h
Simple merge