@@ -593,24 +593,12 @@ static int __rpc_mkpipe_dentry(struct inode *dir, struct dentry *dentry,
static int __rpc_rmdir(struct inode *dir, struct dentry *dentry)
{
- int ret;
-
- dget(dentry);
- ret = simple_rmdir(dir, dentry);
- d_delete(dentry);
- dput(dentry);
- return ret;
+ return simple_remove(dir, dentry);
}
static int __rpc_unlink(struct inode *dir, struct dentry *dentry)
{
- int ret;
-
- dget(dentry);
- ret = simple_unlink(dir, dentry);
- d_delete(dentry);
- dput(dentry);
- return ret;
+ return simple_remove(dir, dentry);
}
static int __rpc_rmpipe(struct inode *dir, struct dentry *dentry)
This will allow generating fsnotify delete events after the fsnotify_nameremove() hook is removed from d_delete(). Cc: Trond Myklebust <trond.myklebust@hammerspace.com> Cc: Anna Schumaker <anna.schumaker@netapp.com> Signed-off-by: Amir Goldstein <amir73il@gmail.com> --- net/sunrpc/rpc_pipe.c | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-)