This will allow generating fsnotify delete events after the fsnotify_nameremove() hook is removed from d_delete(). Cc: Martin Schwidefsky <schwidefsky@xxxxxxxxxx> Cc: Heiko Carstens <heiko.carstens@xxxxxxxxxx> Signed-off-by: Amir Goldstein <amir73il@xxxxxxxxx> --- arch/s390/hypfs/inode.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/arch/s390/hypfs/inode.c b/arch/s390/hypfs/inode.c index ccad1398abd4..30a0ab967461 100644 --- a/arch/s390/hypfs/inode.c +++ b/arch/s390/hypfs/inode.c @@ -70,13 +70,8 @@ static void hypfs_remove(struct dentry *dentry) parent = dentry->d_parent; inode_lock(d_inode(parent)); - if (simple_positive(dentry)) { - if (d_is_dir(dentry)) - simple_rmdir(d_inode(parent), dentry); - else - simple_unlink(d_inode(parent), dentry); - } - d_delete(dentry); + if (simple_positive(dentry)) + simple_remove(d_inode(parent), dentry); dput(dentry); inode_unlock(d_inode(parent)); } -- 2.17.1