diff options
author | Ralf Baechle <ralf@linux-mips.org> | 1999-12-04 03:58:56 +0000 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 1999-12-04 03:58:56 +0000 |
commit | 1d67e90f19a7acfd9a05dc59678e7d0c5090bd0d (patch) | |
tree | 357efc7b93f8f5102110d20d293f41360ec212fc /fs/nfsd | |
parent | aea27b2e18d69af87e673972246e66657b4fa274 (diff) |
Merge with Linux 2.3.21.
Diffstat (limited to 'fs/nfsd')
-rw-r--r-- | fs/nfsd/nfsfh.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/nfsd/nfsfh.c b/fs/nfsd/nfsfh.c index 0c318e212..a1241da96 100644 --- a/fs/nfsd/nfsfh.c +++ b/fs/nfsd/nfsfh.c @@ -824,7 +824,7 @@ printk("lookup_by_inode: ino %ld not found in %s\n", ino, parent->d_name.name); printk("lookup_by_inode: found %s\n", dirent.name); #endif - dentry = lookup_dentry(dirent.name, dget(parent), 0); + dentry = lookup_dentry(dirent.name, parent, 0); if (!IS_ERR(dentry)) { if (dentry->d_inode && dentry->d_inode->i_ino == ino) goto out; @@ -1007,7 +1007,7 @@ dentry->d_parent->d_name.name, dentry->d_name.name); /* * ... then search for the inode in the parent directory. */ - dentry = lookup_by_inode(parent, u32_to_ino_t(fh->fh_ino)); + dentry = lookup_by_inode(dget(parent), u32_to_ino_t(fh->fh_ino)); dput(parent); if (dentry) goto out; |