From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Wed, 3 Oct 2007 01:58:05 +0000 (-0400)
Subject: NFS: Ensure that nfs_link() returns a hashed dentry
X-Git-Tag: v2.6.24-rc1~1285^2~15
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9697d2342e1a480bc14921c52f185c2fe01016e7;p=linux-2.6

NFS: Ensure that nfs_link() returns a hashed dentry

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
---

diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c
index c2207e3f26..d352509d7e 100644
--- a/fs/nfs/dir.c
+++ b/fs/nfs/dir.c
@@ -1506,10 +1506,11 @@ nfs_link(struct dentry *old_dentry, struct inode *dir, struct dentry *dentry)
 		dentry->d_parent->d_name.name, dentry->d_name.name);
 
 	lock_kernel();
+	d_drop(dentry);
 	error = NFS_PROTO(dir)->link(inode, dir, &dentry->d_name);
 	if (error == 0) {
 		atomic_inc(&inode->i_count);
-		d_instantiate(dentry, inode);
+		d_add(dentry, inode);
 	}
 	unlock_kernel();
 	return error;