2 files changed, 17 insertions, 0 deletions

diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c
index ed7c22de9319..4c6848017168 100644
--- a/net/sunrpc/clnt.c
+++ b/net/sunrpc/clnt.c
@@ -222,6 +222,7 @@ static int rpc_pipefs_event(struct notifier_block *nb, unsigned long event,
 
 static struct notifier_block rpc_clients_block = {
         .notifier_call  = rpc_pipefs_event,
+        .priority       = SUNRPC_PIPEFS_RPC_PRIO,
 };
 
 int rpc_clients_notifier_register(void)
diff --git a/net/sunrpc/rpc_pipe.c b/net/sunrpc/rpc_pipe.c
index 6b417fcabdbf..bae4e71d8663 100644
--- a/net/sunrpc/rpc_pipe.c
+++ b/net/sunrpc/rpc_pipe.c
@@ -616,6 +616,22 @@ static int __rpc_rmdir(struct inode *dir, struct dentry *dentry)
         return ret;
 }
 
+int rpc_rmdir(struct dentry *dentry)
+{
+        struct dentry *parent;
+        struct inode *dir;
+        int error;
+
+        parent = dget_parent(dentry);
+        dir = parent->d_inode;
+        mutex_lock_nested(&dir->i_mutex, I_MUTEX_PARENT);
+        error = __rpc_rmdir(dir, dentry);
+        mutex_unlock(&dir->i_mutex);
+        dput(parent);
+        return error;
+}
+EXPORT_SYMBOL_GPL(rpc_rmdir);
+
 static int __rpc_unlink(struct inode *dir, struct dentry *dentry)
 {
         int ret;