diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2005-10-27 22:12:42 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2005-10-27 22:12:42 -0400 |
| commit | cf809556149f076b7a020c10e066b2b96e79b6a1 (patch) | |
| tree | 714d3e58b4fe5af9b144c735601946949b217820 /fs | |
| parent | 516a6af641bb50c608329a5bd751acd0d65cc4ab (diff) | |
| download | kernel-common-cf809556149f076b7a020c10e066b2b96e79b6a1.tar.gz kernel-common-cf809556149f076b7a020c10e066b2b96e79b6a1.tar.bz2 kernel-common-cf809556149f076b7a020c10e066b2b96e79b6a1.zip | |
NFS: Ensure that nfs_link() instantiates the dentry correctly
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/nfs/dir.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c index ce8f77dadff9..8272ed3fc707 100644 --- a/fs/nfs/dir.c +++ b/fs/nfs/dir.c @@ -1432,17 +1432,14 @@ nfs_link(struct dentry *old_dentry, struct inode *dir, struct dentry *dentry) old_dentry->d_parent->d_name.name, old_dentry->d_name.name, dentry->d_parent->d_name.name, dentry->d_name.name); - /* - * Drop the dentry in advance to force a new lookup. - * Since nfs_proc_link doesn't return a file handle, - * we can't use the existing dentry. - */ lock_kernel(); - d_drop(dentry); - nfs_begin_data_update(dir); nfs_begin_data_update(inode); error = NFS_PROTO(dir)->link(inode, dir, &dentry->d_name); + if (error == 0) { + atomic_inc(&inode->i_count); + d_instantiate(dentry, inode); + } nfs_end_data_update(inode); nfs_end_data_update(dir); unlock_kernel(); |