summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2007-10-02 21:58:05 -0400
committerTrond Myklebust <Trond.Myklebust@netapp.com>2007-10-09 17:20:18 -0400
commit9697d2342e1a480bc14921c52f185c2fe01016e7 (patch)
treebd4fba02d28777fc7705d8937a19740940fd5317 /fs
parenta12802cab8520f86c9a80bbf87d10ee6171687d1 (diff)
downloadblackbird-op-linux-9697d2342e1a480bc14921c52f185c2fe01016e7.tar.gz
blackbird-op-linux-9697d2342e1a480bc14921c52f185c2fe01016e7.zip
NFS: Ensure that nfs_link() returns a hashed dentry
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/nfs/dir.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c
index c2207e3f2634..d352509d7e2d 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;
OpenPOWER on IntegriCloud