1 files changed, 6 insertions, 2 deletions

diff --git a/net/sunrpc/rpc_pipe.c b/net/sunrpc/rpc_pipe.c
index e7ce4b3eb0bd..4679df5a6d50 100644
--- a/net/sunrpc/rpc_pipe.c
+++ b/net/sunrpc/rpc_pipe.c
@@ -667,7 +667,8 @@ static struct dentry *__rpc_lookup_create_exclusive(struct dentry *parent,
                         return ERR_PTR(-ENOMEM);
         }
         if (dentry->d_inode == NULL) {
-                d_set_d_op(dentry, &rpc_dentry_operations);
+                if (!dentry->d_op)
+                        d_set_d_op(dentry, &rpc_dentry_operations);
                 return dentry;
         }
         dput(dentry);
@@ -1126,6 +1127,7 @@ rpc_fill_super(struct super_block *sb, void *data, int silent)
                 return -ENOMEM;
         dprintk("RPC:       sending pipefs MOUNT notification for net %p%s\n",
                 net, NET_NAME(net));
+        mutex_lock(&sn->pipefs_sb_lock);
         sn->pipefs_sb = sb;
         err = blocking_notifier_call_chain(&rpc_pipefs_notifier_list,
                                            RPC_PIPEFS_MOUNT,
@@ -1133,6 +1135,7 @@ rpc_fill_super(struct super_block *sb, void *data, int silent)
         if (err)
                 goto err_depopulate;
         sb->s_fs_info = get_net(net);
+        mutex_unlock(&sn->pipefs_sb_lock);
         return 0;
 
 err_depopulate:
@@ -1141,6 +1144,7 @@ err_depopulate:
                                            sb);
         sn->pipefs_sb = NULL;
         __rpc_depopulate(root, files, RPCAUTH_lockd, RPCAUTH_RootEOF);
+        mutex_unlock(&sn->pipefs_sb_lock);
         return err;
 }
 
@@ -1162,12 +1166,12 @@ static void rpc_kill_sb(struct super_block *sb)
                 goto out;
         }
         sn->pipefs_sb = NULL;
-        mutex_unlock(&sn->pipefs_sb_lock);
         dprintk("RPC:       sending pipefs UMOUNT notification for net %p%s\n",
                 net, NET_NAME(net));
         blocking_notifier_call_chain(&rpc_pipefs_notifier_list,
                                            RPC_PIPEFS_UMOUNT,
                                            sb);
+        mutex_unlock(&sn->pipefs_sb_lock);
         put_net(net);
 out:
         kill_litter_super(sb);