diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-07-09 23:29:35 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-07-09 23:29:35 +0000 |
| commit | 35385d7a83b4cae6d5ea5f80f3b3377d94178344 (patch) | |
| tree | 49494d95dfef31ba4f9a697d31e4028cf65a57bd /fs/nfsd | |
| parent | d9d8062e7b49943b2a2fb034f817a9fc217fd40f (diff) | |
Merge with 2.4.0-test3-pre7.
Diffstat (limited to 'fs/nfsd')
| -rw-r--r-- | fs/nfsd/nfsfh.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/nfsd/nfsfh.c b/fs/nfsd/nfsfh.c index cc3896c38..52a0348c1 100644 --- a/fs/nfsd/nfsfh.c +++ b/fs/nfsd/nfsfh.c @@ -155,7 +155,7 @@ static struct dentry *nfsd_iget(struct super_block *sb, unsigned long ino, __u32 for (lp = inode->i_dentry.next; lp != &inode->i_dentry ; lp=lp->next) { result = list_entry(lp,struct dentry, d_alias); if (! (result->d_flags & DCACHE_NFSD_DISCONNECTED)) { - dget(result); + dget_locked(result); spin_unlock(&dcache_lock); iput(inode); return result; @@ -260,7 +260,7 @@ struct dentry *nfsd_findparent(struct dentry *child) pdentry = list_entry(aliases->prev, struct dentry, d_alias); if (pdentry == tdentry) pdentry = NULL; - if (pdentry) dget(pdentry); + if (pdentry) dget_locked(pdentry); } spin_unlock(&dcache_lock); if (pdentry == NULL) { @@ -305,7 +305,7 @@ static struct dentry *splice(struct dentry *child, struct dentry *parent) for (lp = child->d_inode->i_dentry.next; lp != &child->d_inode->i_dentry ; lp=lp->next) { tmp = list_entry(lp,struct dentry, d_alias); if (tmp->d_parent == parent) { - child = dget(tmp); + child = dget_locked(tmp); spin_unlock(&dcache_lock); goto out; } |