patch-2.1.44 linux/fs/nfs/inode.c

• Lines: 28
• Date: Mon Jul 7 13:06:09 1997
• Orig file: v2.1.43/linux/fs/nfs/inode.c
• Orig date: Mon Jun 16 16:35:58 1997

diff -u --recursive --new-file v2.1.43/linux/fs/nfs/inode.c linux/fs/nfs/inode.c
@@ -74,8 +74,6 @@
 {
 	dprintk("NFS: put_inode(%x/%ld)\n", inode->i_dev, inode->i_ino);
 
-	if (NFS_RENAMED_DIR(inode))
-		nfs_sillyrename_cleanup(inode);
 	if (inode->i_pipe)
 		clear_inode(inode);
 }
@@ -230,7 +228,8 @@
 	/* Unlock super block and try to get root fh attributes */
 	unlock_super(sb);
 
-	if ((sb->s_mounted = nfs_fhget(sb, &data->root, NULL)) != NULL) {
+	sb->s_root = d_alloc_root(nfs_fhget(sb, &data->root, NULL), NULL);
+	if (sb->s_root != NULL) {
 		/* We're airborne */
 		if (!(server->flags & NFS_MOUNT_NONLM))
 			lockd_up();
@@ -435,7 +434,7 @@
  */
 static struct file_system_type nfs_fs_type = {
 	"nfs",
-	FS_NO_DCACHE,
+	0 /* FS_NO_DCACHE - this doesn't work right now*/,
 	nfs_read_super,
 	NULL
 };