1 files changed, 9 insertions, 10 deletions

diff --git a/fs/nfsd/nfsctl.c b/fs/nfsd/nfsctl.c
index 13c548733860..3cf4f6aa48d6 100644
--- a/fs/nfsd/nfsctl.c
+++ b/fs/nfsd/nfsctl.c
@@ -1171,13 +1171,17 @@ static struct inode *nfsd_get_inode(struct super_block *sb, umode_t mode)
         return inode;
 }
 
-static int __nfsd_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode)
+static int __nfsd_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode, struct nfsdfs_client *ncl)
 {
         struct inode *inode;
 
         inode = nfsd_get_inode(dir->i_sb, mode);
         if (!inode)
                 return -ENOMEM;
+        if (ncl) {
+                inode->i_private = ncl;
+                kref_get(&ncl->cl_ref);
+        }
         d_add(dentry, inode);
         inc_nlink(dir);
         fsnotify_mkdir(dir, dentry);
@@ -1194,17 +1198,14 @@ static struct dentry *nfsd_mkdir(struct dentry *parent, struct nfsdfs_client *nc
         dentry = d_alloc_name(parent, name);
         if (!dentry)
                 goto out_err;
-        ret = __nfsd_mkdir(d_inode(parent), dentry, S_IFDIR | 0600);
+        ret = __nfsd_mkdir(d_inode(parent), dentry, S_IFDIR | 0600, ncl);
         if (ret)
                 goto out_err;
-        if (ncl) {
-                d_inode(dentry)->i_private = ncl;
-                kref_get(&ncl->cl_ref);
-        }
 out:
         inode_unlock(dir);
         return dentry;
 out_err:
+        dput(dentry);
         dentry = ERR_PTR(ret);
         goto out;
 }
@@ -1214,11 +1215,9 @@ static void clear_ncl(struct inode *inode)
         struct nfsdfs_client *ncl = inode->i_private;
 
         inode->i_private = NULL;
-        synchronize_rcu();
         kref_put(&ncl->cl_ref, ncl->cl_release);
 }
 
-
 static struct nfsdfs_client *__get_nfsdfs_client(struct inode *inode)
 {
         struct nfsdfs_client *nc = inode->i_private;
@@ -1232,9 +1231,9 @@ struct nfsdfs_client *get_nfsdfs_client(struct inode *inode)
 {
         struct nfsdfs_client *nc;
 
-        rcu_read_lock();
+        inode_lock_shared(inode);
         nc = __get_nfsdfs_client(inode);
-        rcu_read_unlock();
+        inode_unlock_shared(inode);
         return nc;
 }
 /* from __rpc_unlink */