patch-2.1.82 linux/fs/nfs/dir.c

Next file: linux/fs/nfs/inode.c
Previous file: linux/fs/filesystems.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.81/linux/fs/nfs/dir.c linux/fs/nfs/dir.c
@@ -535,11 +535,6 @@
 	}
 }
 
-static void nfs_set_fh(struct dentry *dentry, struct nfs_fh *fhandle)
-{
-	*((struct nfs_fh *) dentry->d_fsdata) = *fhandle;
-}
-
 static int nfs_lookup(struct inode *dir, struct dentry * dentry)
 {
 	struct inode *inode;
@@ -574,8 +569,7 @@
 		goto no_entry;
 	if (!error) {
 		error = -EACCES;
-		nfs_set_fh(dentry, &fhandle);
-		inode = nfs_fhget(dentry->d_sb, &fhandle, &fattr);
+		inode = nfs_fhget(dentry, &fhandle, &fattr);
 		if (inode) {
 #ifdef NFS_PARANOIA
 if (inode->i_count > (S_ISDIR(inode->i_mode) ? 1 : inode->i_nlink)) {
@@ -609,8 +603,7 @@
 	struct inode *inode;
 	int error = -EACCES;
 
-	nfs_set_fh(dentry, fhandle);
-	inode = nfs_fhget(dentry->d_sb, fhandle, fattr);
+	inode = nfs_fhget(dentry, fhandle, fattr);
 	if (inode) {
 #ifdef NFS_PARANOIA
 if (inode->i_count > (S_ISDIR(inode->i_mode) ? 1 : inode->i_nlink)) {

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov