fsnotify: get rid of fsnotify_nameremove()

For all callers of fsnotify_{unlink,rmdir}(), we made sure that d_parent
and d_name are stable.  Therefore, fsnotify_{unlink,rmdir}() do not need
the safety measures in fsnotify_nameremove() to stabilize parent and name.
We can now simplify those hooks and get rid of fsnotify_nameremove().

Signed-off-by: Amir Goldstein <amir73il@gmail.com>
Signed-off-by: Jan Kara <jack@suse.cz>

diff --git a/fs/notify/fsnotify.c b/fs/notify/fsnotify.c
index 4eb2ebfac4689939a12cc21685d2daaae472943f..2ecef6155fc0ded7d39e7e8b84b71a9356784a69 100644 (file)
--- a/fs/notify/fsnotify.c
+++ b/fs/notify/fsnotify.c
@@ -94,47 +94,6 @@ void fsnotify_sb_delete(struct super_block *sb)
        fsnotify_clear_marks_by_sb(sb);
 }
 
-/*
- * 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 --git a/include/linux/fsnotify.h b/include/linux/fsnotify.h
index 0145073c2b422f6375108fdc0cace0a911f87fb1..a2d5d175d3c15f9ca4b31818a6783830a8746213 100644 (file)
--- a/include/linux/fsnotify.h
+++ b/include/linux/fsnotify.h
@@ -198,8 +198,7 @@ static inline void fsnotify_unlink(struct inode *dir, struct dentry *dentry)
        /* Expected to be called before d_delete() */
        WARN_ON_ONCE(d_is_negative(dentry));
 
-       /* TODO: call fsnotify_dirent() */
-       fsnotify_nameremove(dentry, 0);
+       fsnotify_dirent(dir, dentry, FS_DELETE);
 }
 
 /*
@@ -222,8 +221,7 @@ static inline void fsnotify_rmdir(struct inode *dir, struct dentry *dentry)
        /* Expected to be called before d_delete() */
        WARN_ON_ONCE(d_is_negative(dentry));
 
-       /* TODO: call fsnotify_dirent() */
-       fsnotify_nameremove(dentry, 1);
+       fsnotify_dirent(dir, dentry, FS_DELETE | FS_ISDIR);
 }
 
 /*

diff --git a/include/linux/fsnotify_backend.h b/include/linux/fsnotify_backend.h
index a9f9dcc1e5151353a9664fa99fb9eb7b1c3ed46d..c28f6ed1f59b82302b0a733090fecfb42bc1436c 100644 (file)
--- a/include/linux/fsnotify_backend.h
+++ b/include/linux/fsnotify_backend.h
@@ -355,7 +355,6 @@ extern int __fsnotify_parent(const struct path *path, struct dentry *dentry, __u
 extern void __fsnotify_inode_delete(struct inode *inode);
 extern void __fsnotify_vfsmount_delete(struct vfsmount *mnt);
 extern void fsnotify_sb_delete(struct super_block *sb);
-extern void fsnotify_nameremove(struct dentry *dentry, int isdir);
 extern u32 fsnotify_get_cookie(void);
 
 static inline int fsnotify_inode_watches_children(struct inode *inode)
@@ -525,9 +524,6 @@ static inline void __fsnotify_vfsmount_delete(struct vfsmount *mnt)
 static inline void fsnotify_sb_delete(struct super_block *sb)
 {}
 
-static inline void fsnotify_nameremove(struct dentry *dentry, int isdir)
-{}
-
 static inline void fsnotify_update_flags(struct dentry *dentry)
 {}